update travis ci
Merge branch 'master' of https://github.com/jentzheng/rails4-app

Conflicts:
	.travis.yml