locations erb cleanup
Merge branch 'master' into locations_update
Merge pull request #31 from jlambert121/locations_update

Locations update