f79e97d8

By: Michael Lynch <git@mtlynch.io>

Merge branch 'string-user-ids' into shared-secret-auth