Merge pull request #2 from jahoopes/master

Added google maps api
Merge pull request #3 from jahoopes/master

added search functionality to map
Committing Instagram authentication work in progress to sync with John's JS changes to Google Maps.
Merge pull request #4 from jahoopes/master

added distance formula to googlemaps.js
Saving John's maps changes to the ruby files to sort out Instagram.

Merge branch 'master' into kenny
Troubleshooting Instagram AJAX
Merge pull request #5 from kplandes/kenny

Kenny
got instagram api working