Manual merge of 6baba207fe1b75ce22c35e1e14c9f065f8d3b1e4 until I figure out git
Fixing some weird bug with /nick_lookup that I still haven't figured out
Remove a debug line