Revert Pillowtop changes
Merge pull request #4136 from dimagi/revert-pillowtop

Revert Pillowtop changes
update settings to allow tests to pass
Merge pull request #4137 from dimagi/pillow-tests

update settings to allow tests to pass
Updated to vellum:425c30e

This commit, which will most likely not make it into the permanent source history of Vellum is: 
'128716-fix-missing-tree', '127310-duplicate-questions' and '130785-double-dup' into staging
Merge remote-tracking branch 'origin/archive-products+explicit_case_processing' into autostaging
Merge remote-tracking branch 'origin/explicit_case_processing' into autostaging
Merge remote-tracking branch 'origin/schedule' into autostaging
Merge remote-tracking branch 'origin/commconnect-reports' into autostaging
Merge remote-tracking branch 'origin/hq-dropdown' into autostaging
Merge remote-tracking branch 'origin/refactor-domain-copy2' into autostaging
Merge remote-tracking branch 'origin/logos' into autostaging
Merge branch 'vellum-requirejs' into autostaging
Merge remote-tracking branch 'origin/emwf-refactor' into autostaging
Merge remote-tracking branch 'origin/admin-reports' into autostaging
Merge remote-tracking branch 'origin/archive-products+archive-to-deactivate' into autostaging
Merge remote-tracking branch 'origin/opm' into autostaging
Merge remote-tracking branch 'origin/increase-es-timeout' into autostaging
Merge remote-tracking branch 'origin/parent-child-select-revised' into autostaging
Merge remote-tracking branch 'origin/vellum-requirejs+bootstrap3-stylin' into autostaging