updated travis file
Merge branch 'travis-update' into develop
Merge branch 'develop'