Preparing for v2.5.5
Merge pull request #379 from meatballhat/v2.5.5-prep

Preparing for v2.5.5