Merge pull request #304 from bjwatson/changelog-1.5.5

Preparing for v1.5.5