Revert "Update to match plugins/master"

Reverts GigaOM/go-recaptcha#2

None of those changes are worth keeping, in fact some of them are a regression. Apologies.