More migrated code, updated travis config.