Initial travis-ci conf
Merge branch 'travis'