Prepare a 2.5.0 release.
Merge pull request #243 from apenney/2.4.2-release

2.5.0 release.