Updated to reflect changes in Bukkit and CH
Fix indents.
Merge pull request #1 from PseudoKnight/master

Compatibility update
Thanks PseudoKnight