added .travis.yml for travis CI integration
Merge branch 'master' into config-tests
fixed tests