Added CHANGES.txt file, removed History section from README.rst and changed code in setup.py to support CHANGES.txt
Merge branch 'master' into improvements
Merge branch 'improvements'
Merge branch 'master' of https://github.com/MarounMaroun/nose-docstring

Conflicts:
	README.rst