0.0.12
add @stuartf as a contributor
Merge branch 'master' into mocha

Conflicts:
	package.json