Revert "Updated to bukkit 1.7.2 and cleaned up"

This reverts commit 70adc7fb95ab93ff953f577ea9a0deb0b5917689.