Pulling new stuff and starting to add geo location
Merge branch 'master' of https://github.com/krmannix/spotted