Add travis config and modify tests so they work on travis.
Merge branch 'add_travis_config' into develop