Added ItemStackComparators. Merges #327
Fixed incorrect javadoc