Bugfixes related to the google map.
Merge branch 'master' of https://github.com/benbrouse/bbw2014