progress on map layout
maps working with geocoding on address
Merge pull request #26 from tiger-swallowtails-2013/maps

Maps
fix merge conflicts