updating changelog
Merge branch 'master' into update_changelog

Conflicts:
	CHANGES.txt
Merge pull request #83 from enthought/update_changelog

Updating the Traits changelog