Fix invalid method reference
Merge branch 'master' into bypass-callback-if-god

* master:
  Revert "Merge pull request #68 from bengler/bypass-callback-if-god"

Conflicts:
	api/v1/callbacks.rb
Merge branch 'bypass-callback-if-god'

* bypass-callback-if-god:
  Fix invalid method reference