Increment version
Update bukkit 1.6.4-R0.1
Merge branch 'master' into playershops2
Make player shops compatible with composite objects.