Added travis-ci yml file
Merge branch 'master' into v2alt