travis configuration
Merge branch 'travis-ci'