Update to use java 5 generics. Get rest of Eclipse warnings cleaned up. Nothing major at this point.
Changed paths: