Removing a dud reference to active'
Patching a bug in order cycle partial
Removing specs that accidentally got in here
Removing chili spec
Restoring our toggle option
Merging in master