Update .travis.yml
Testing config
Update .travis.yml
Merge branch 'master' into simulation
Merge remote-tracking branch 'origin/simulation' into simulation
Fixed tests