Added back acts_as_geolocated
Merge branch 'master' of github.com:jdjkelly/quantify