Adding support for JDK8

Added support for JDK 8.  Merging into develop - not sure if I should, but that's why you're seeing some of the other commits in there.