Another great big commit
Merge branch 'master' into gh-pages

Conflicts:
	_config.yml