Module clean up, specs, travis, etc.