travis build only when pushing to master branch
Merge branch 'travis-config'