map displays on location page
Merge pull request #27 from bchiatt/kayla

Kayla
nav
Merge pull request #28 from bchiatt/angular

map displays on location page
Merge branch 'master' into kayla