Cleanup and Syntax Fix
Django-Compressor dirtyfix
Fix conflicts