Portion of Merchant API.
Start with our own file, then handle over to CraftBukkit.
Merge branch 'playground' of git@github.com:SurgeDev/Surge.git into playground
Small SurgePrintStream fix.
Merge branch 'master' into playground
Hopefully fixed http://pastie.org/5663358