Update .travis.yml

only master and dev are tested
Merge branch 'dev' into parallelCheck

* dev:
  Update .travis.yml