Added 'pw' option to password regex
Merge remote-tracking branch 'upstream/master' into issue-1-pw-alias

Conflicts:
	client/regex.js
Not sure why the merge didn't work the first time.
Hopefully the last mistake :)
Merge pull request #1 from cinaglia/issue-1-pw-alias

Typing /password for private channels is annoying, add /pw as an alias