added django-compressor
automerge with head