travis ci configured
Merge branch 'travis-config'