fix registration for NICK
Merge branch 'master' of github.com:rfw/merc