Fixing okubot to work with the PircBotX 2.0 library (no formatting this time, I promise)

also included some minor  code beautifications