jekyll up to 2.4.0
long time no see
Merge branch 'master' into gh-pages

Conflicts:
	_config.yml