Style changes to fit on one screen
Change spacing and size in header
fix changes from merge
changes from merging
Style changes in the comparison carousel
Merge branch 'wanderingslc-master'

Conflicts:
	app/views/home/index.html.slim
add in Stan's changes, plus some more cosmetic improvements