Clean up TODOs and comments
Merge branch 'master' of github.com:gsec/eZchat