John updated us to ruby 2.1.2
merged with master
Formatting & CSS fixes
Fix duplicate navbar, clean up application layout
Remove unnecessary stylesheet links
fixed tests
fixed hound stuff
Merge pull request #35 from LaunchAcademy/jg-cleanup-views

RFR - Jg cleanup views
Resolve merge conflicts