minor tweaks
Merge branch 'master' of github.com:zack-fisch/hackbikeshare-2014

Fixing merge conflict
Add Map to nav
Fixing merge conflict