exception handling for geolocation
Merge pull request #42 from scalableinternetservices/exceptions

exception handling for geolocation
The wavedata is no longer called each time you show a location, but is added to the database. The favorite spots now have a rating
Merge pull request #43 from scalableinternetservices/wave

The wavedata is no longer called each time you show a location, but is a...
asset pipelining for javascripts
Merge branch 'master' of https://github.com/scalableinternetservices/BaconWindshield into pipelining
deleted unnecessary api call method in locations controller
Merge pull request #44 from scalableinternetservices/pipelining

piercing reqest merged
Added some action caching to the locations index page.
Merge branch 'master' of https://github.com/scalableinternetservices/baconwindshield into caching

Conflicts:
	app/views/landings/index.html.erb
fixed action caches on location index, and conties index and show, the caches will now expire on edit, as well as after 24 hours
Merge pull request #45 from scalableinternetservices/caching

Caching
merged with master