Revert "Update to match plugins/master"
Merge pull request #3 from GigaOM/revert-2-master

Revert "Update to match plugins/master"