Prepping for v2.5.1 release
Merge pull request #345 from meatballhat/v2.5.1-prep

Prepping for v2.5.1 release