Prepping for v2.5.0 release
Merge pull request #342 from meatballhat/v2.5.0-release-prep

Prepping for v2.5.0 release