Add Travis CI
Merge branch 'travis' into develop