Improved testing.
Add Travis CI support.
Merge branch 'improved-testing'