Merge pull request #184 from mozilla-services/dev

Merge latest mods from dev
Fix to debug statement