Update to rails 4.1.5
Merge branch 'update_ruby_and_rails'