local changes
Merge branch 'master' of github.com:BanzaiMan/travis_production_test

Conflicts:
	.travis.yml