1.7.2
Merge branch '1.7.2' of https://github.com/Klemms/CraftBukkit into 1.7.2