Merge remote-tracking branch 'origin/master'

Conflicts:
	_data/useful_gen_links.yml

Upgraded to newer version of Jekyll
Merge remote-tracking branch 'origin/master'

Conflicts:
	_data/useful_gen_links.yml