Adds 4.1 gemfile to travis.yml
Changes actionpack dev dep
Fixing test requirements
Fix merge conflicts for Rails 4.1 support