Revert "New better api for manipulating villagers."

This reverts commit db71635ecadb0890d528595bc80a02bd62db418f.

Conflicts:
	src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryMerchant.java
	src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantOffers.java
Yet Another Rewrite <3
Implement equals() using custom definition

The InventoryMerchant objects are sometimes created on-the-fly, so this is necessary here.