Rethinking of some URLs, backed up slightly on gh-pages metadata use
Merge branch 'bp' into gh-pages

Conflicts:
	_config.yml