fix CAP messages
Merge remote-tracking branch 'origin/master' into user-mask

Conflicts:
	irc/types.go