Revert "Merge pull request #26 from jrconlin/dev"

This reverts commit aa83f68c391553af186a4c044ed1357491fa94c7, reversing
changes made to 4b9b0651bbc0159c8e237e66a2ce823f3ab850a4.
Merge pull request #65 from mozilla-services/revert_pr

Revert pr #26 from master
Merge pull request #28 from jrconlin/master

Revert pr #26 from master