v0.6.48 Use waffles switches and fxa settings provided by zamboni if present (bug 1093584)
Merge pull request #56 from diox/use-config-in-body-if-present

Use waffles switches and fxa settings provided by zamboni if present (bug 1093584)