cache -- set Gemfile back to original so no spurious merge items
Merge branch 'cache' into cache-hosting