Thanks for your advice, guys! Okay, to answer some questions and give more info:
I started with tap water with some store-recommended water-conditioner, and (obviously) marine salt.
Since I started doing water changes I've been buying water from the shop, 25 litres at a time, and changing that...