Replace django-features with Gargoyle
Merge gargoyle switches
Merge master (Gargoyle switches)