A bunch of tidying. Fixed two botched overrides.
Wire up a Travis build.