Fixed bukkit classpath error, added SinkLibrary
Merge remote-tracking branch 'github/master'