Added Villager trading api. Adds BUKKIT-2138, BUKKIT-3935
Merge branch 'master' of https://github.com/thefishlive/Bukkit