Pre-deployment tweaks (20m)

[g105b]

This is just a quick bit of work.

I'm going to tidy up the branches we have open, then work on #45 so in the morning I can set up the branch deployment