Add travis-ci configuration
Merge branch 'master' into nextgen