rearranging geo functions; elimnating the need to save the user's geolocation to Parse
still need to chain geo functions using promises
updated underscore templates
fixed merge conflict