Bumping to v2.5.4 as we've hit the milestone
Merge pull request #363 from meatballhat/v2.5.4-prep

Bumping to v2.5.4 as we've hit the milestone