add a travis yml
Merge branch 'master' into travisci