Made Java code compile with Java 1.6
Cleaned up Java generics to avoid warnings
Version bump
Merge pull request #4 from TheClimateCorporation/java

Java v1.6 support