Updated Travis-CI to test rails_4 branch
Merge branch 'master' into rails_4