Make the client management system more sane.
Merge branch 'master' of https://github.com/humanity/humanity