Geo: adding in changes to make it work with python 3.4, and a few other tweaks, thanks to FUBAR