Merge branch 'master' into release

Conflicts:
	README.rst
Update changelog

Update changelog to reflect final v0.4 updates
Merge branch 'develop' into release

Conflicts:
	README.rst