Lots of moving code around; Zappa's learning curve.
Merge branch 'master' of https://github.com/Modified/Jibbrit
Just comments. And spaces->tabs.