Updates for the 0.4.0 release
Merge branch 'release/0.4.0' into develop

Conflicts:
	README.md
	project/Build.scala