update travis-build
Merge branch 'master' into docker_in_da_house

Conflicts:
	Gemfile.lock