Make tests run with Travis.
Merge branch 'travis'