Update to rails 4.1.1
Merge pull request #69 from ruedap/staging

Update to rails 4.1.1