Updated Travis config
Merge branch 'master' into features/rails-4