Updated .travis.yml, straightened out some inheritance relationships