Don't default to have the map show the user's location.
Merge remote-tracking branch 'origin/master'