Simplify tests after trying things out
Add Travis config file.
Merge branch 'master' into issue24

* master:
  Add Travis config file.