Update .travis.yml
Update .travis.yml
Update .travis.yml
Merge branch 'master' of github.com:fortitude/fortitude-docs

Conflicts:
	.travis.yml