Fix indentation.
Move travis branch specific command into bash script so we don't have to deal with merge issues.
Merge branch 'release/1.0.5'

Conflicts:
	.travis.yml