TravisCI changes
Merge branch 'travisci' into develop
Remove 'travisci' from the yml