Merge pull request #167 from trevorbernard/master

Fix javadoc lint in Java 8
Fix formatting to more match the checkstyle config