changelog should be up-to date
Merge pull request #442 from calabash/feature/update-changelog

changelog should be up-to date