Update .travis.yml
Merge branch 'activemodel_validator' into locomote

Conflicts:
	.travis.yml