Switched to bukkit only API, updated to latest version.
Fixed comparator not respecting the contract.
Fixed an NPE when adding an element to the map.
v6.1.1 release