removed caching
upgraded rails 4.1.5
merged