Removing users in favor of simpler and more extensible identifiers
Merge remote-tracking branch 'origin/master'

* origin/master:
  Update README.md