Working caching
Merge branch 'master' into with_caching
Remove actioncontroller caching from Gemfile
Style updates
Restore to non-caching version