Tiny tweaks.
Merge branch 'master' of github.com:alnorth29/cultivate-london

Conflicts:
	app/assets/javascripts/database.js.coffee