Misc cleanups
Merge branch 'master' of github.com:Yubico/yubico-java-client