Merge master
Ignore cache folder
Use rack-cache only in production