Version bumps and markup fixes necessary for building on JDK8
Merge pull request #13 from batterseapower/master

Version bumps and markup fixes necessary for building on JDK8