Reformat code
Fix a year old bug
Change default timeout to reduce 'deadlocking'
Bump support craftbukkit version