Java: fix test 16
Java: remove trailing whitespace
Java: add `nfc` helper
Java: apply a more standard formatting for long lines
Sort results alphabetically
Remove trailing whitespace from README.md
Merge pull request #7 from earl/java

Fix test 16 for Java and some minor cleanup for Java and the README