Java 5 updates - mostly to use generics, but also remove some depreca… …
…ted stuff
Modified to be compatible with new node locality structure
Initial commit to github
