Version bumps and markup fixes necessary for building on JDK8