tidy up (and separate) afk and note functionality.  Implement #309
Merge pull request #962 from JabbR/afk-msg

Improve AFK/Note