Add Hubot support
Merge branch 'refs/heads/master' into hubot
Last tweaks to Hubot stuff
Merge branch 'refs/heads/hubot'