go back to using uid as per chat with Adam
Merge branch 'master' of https://github.com/CruGlobal/godchat