Merge pull request #24 from andrewraynal/master

zip posting now
Um, we have a chinese? map
At some point today, this shall work
Trying to fix merge issues
Geolocate is working
merge