Implemented merge/parition user update functions (untested)
Merge branch 'master' of https://github.com/sshamilton/chatservice