Update changelog
Merge branch 'master' of https://github.com/ndmitchell/ghc-make

Conflicts:
	CHANGES.txt