Minor refactor, styling
Merge branch 'master' into refactor
merging from master

Conflicts:
	app/views/collections/show.html.haml
	app/views/layouts/application.html.haml
revert to id in collections path
diffs from master merge