Merge branch 'code-cssminify' into code-htmlminify

Conflicts:
	.metalsmith/gulpfile.coffee
	.metalsmith/package.json
Merge branch 'master' into code-jsminify

Conflicts:
	.metalsmith/gulpfile.coffee
	.metalsmith/package.json
Merge branch 'guide-dash'
Merge branch 'master' into preview

Conflicts:
	.metalsmith/gulpfile.coffee
	.metalsmith/package.json