Update to latest upstream
Update SportBukkit to 1.6.4