Merge pull request #13 from grawity/remove-junk

Remove junk
Fix compile failures
Fix compile failures introduced in 8000fa002653cd7d21c1834458c87d34926b72c0
Merge branch 'master' of https://github.com/rabbitircd/rabbitircd
Fix one more build failure caused by crap-removal