add a couple more feats
messin with a gevent-based irc/websocket broadcaster
resolve feats merge conflict