Update changelog
Resolved conflicts in contrib
Update unwanted changes
Remove indentation
Merge pull request #222 from guardian/hg-update-contrib-docs

Hg update contrib docs