updated with better location function
Merge branch 'master' of https://github.com/melaniecebula/geo.ly