General cleanup and fix Travis CI configuration.