updated dependency to CB 1.6.4-R1.0
updated bukkit dependency to 1.6.4-R2.0
Merge remote-tracking branch 'origin/master' into deprecation_fixes