more changes to /ircnick that i should have caught
Merge branch 'master' of github.com:siosilvar/BungeeRelay into siosilvar-master
Merge branch 'siosilvar-master'

Conflicts:
	src/io/github/dead_i/bungeerelay/commands/IRCNickCommand.java