Map functionality
Merge branch 'master' of https://github.com/adamreis/GeoCash

To merge Kaitlin and Rachel's map changes