mostly fix geolocation stuff
 merged from master 2013-01-29T15:01:55-06:00