fix update for craftbukkit
Merge branch 'master' of https://github.com/wenlock/craftbukkit-bootstrap