tweak travis yaml
Merge branch 'master' of github.com:kevindawson/App-Midgen

Conflicts:
	.travis.yml