Merge branch 'master' into gh-pages

Conflicts:
	Gruntfile.coffee
	package.json
	src/zazen.coffee
Add clean test files to grunt tasks
Merge branch 'master' into gh-pages

Conflicts:
	Gruntfile.coffee
Write about `resolve` and `reject` keywords