move fluff pillow config to where it can be overridden by localsettings
Merge pull request #687 from dimagi/cz

move fluff pillow config to where it can be overridden by localsettings