Add Merchant Trade API - Adds BUKKIT-5663
Clean up javadocs.