Added Shannon-Weaver and Inverse Simpson diversity indices, some refactoring