Clean up imports and whitespace
Clean up line endings
Fix some references to models
Use 'occasions' instead of 'occasion_set'