Don't do this
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

Conflicts:
	caveats.html
	classes.html
	index.html
	lifecycle.html
	package.json
	plugins.html
	projects.html
	spirits.html
	utils.html