Version 0.3.0
Version 0.3.1
Merge branch 'master' into develop

Conflicts:
	.DS_Store
	kabuki.js
	test/.DS_Store
	test/SpecRunner.html
	test/spec/.DS_Store
	test/spec/defining.js