Add /testfor command support to command block. Adds BUKKIT-3813
Merge remote-tracking branch 'upstream/master'