Commit to merge in map updates
Merge branch 'master' of github.com:theautocrat/Navigator

Merged with updated map