Merge pull request #544 from arnvald/improve_travis_matrix

Change way of running travis tests
Merge branch 'master' into rails_4_1_fix