Some general last bits of tidyup, and a new version number

Hi again, sorry, this is the last bit!

This pulls together a couple of tweaks I noticed en route to the other changes, and also increases the version to 0.6.0, after all our recent changes. Check you're happy with this, and once it's merged I'll push a new release out.