3632 Tidy new code, rename option for any collection
3632 Improve indenting in collection filters view
3632 Tests for Travis to run so I can see if the last step fails there too