MOAR TP fixes.
Merge branch 'master' of ssh://github.com/keepcalm/BukkitForge