Bump version to 0.4.1
Merge remote-tracking branch 'refs/remotes/origin/master' into master-merge-041

Conflicts:
	CHANGES.rst
	docs/source/conf.py
	setup.py
Merge pull request #76 from sjagoe/master-merge-041

Master merge 041