Changed the way the envelope.user is build so it won't clash with hubot-irc
Merge pull request #1161 from pascaldevink/master

Changed the way the envelope.user is build so it won't clash with hubot-irc