Prepare a 2.3.1 release.
Merge pull request #541 from apenney/231-release

Prepare a 2.3.1 release.