Add geolocation
Merge branch 'jonah'
Merge branch 'master' of https://github.com/danheidel/alongtheway