Merge pull request #250 from jamiehannaford/auth-utils

Auth utils