update travis-yaml
Merge branch 'rkh-deploys-new-travis-yaml'

Conflicts:
	Gemfile.lock