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