Added support for /join [channel_name].
Merge remote-tracking branch 'upstream/master' into issue-17-join-channel
Oops, fixing comment
Merge pull request #17 from cinaglia/issue-17-join-channel

/join to join a channel
Merge remote-tracking branch 'upstream/master' into issue-1-pw-alias

Conflicts:
	client/regex.js