Merge biojava-3.1.0 changes into master

The dev-3.1.0 branch cherry-picked several commits from master. This completes the release by merging those changes back into master.