Merge pull request #68 from bengler/bypass-callback-if-god

Don't call psm callbacks if current identity is god
Revert "Merge pull request #68 from bengler/bypass-callback-if-god"

This reverts commit b7d79ae23f589cfeaafcaba883f8616683cd1c59, reversing
changes made to 0fb344c1d56ad239525b9a58e6055accd65a13b1.
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