Concise formatting of /roster command
Merge remote-tracking branch 'tdi/master'