added some geoloc code in python, finalizing controller code
Merge branch 'master' of https://github.com/codelucas/antchatter

Conflicts:
	.models.js.swp