updated changelog
Merge branch 'master' of https://github.com/plumi/plumi.skin

Conflicts:
	CHANGES.txt