Merge branch 'master' into gh-pages
map styling
JS cleanup
hero carousel styling (controls)
Merge branch 'gh-pages'