Merge branch 'master' into gh-pages

Conflicts:
	Gruntfile.coffee
	package.json
	src/zazen.coffee