Cleanup. Removed imports
Changed travis email address for testing purposes