added .travis.yml
Merge branch 'travis' into tests