Remove tabs from .travis.yml. YAML requires indentation with spaces.
Merge branch 'setup-travis' into develop
Merge branch 'develop'