some refinements
clear up site structure
Merge branch 'master' into gh-pages

Conflicts:
	_includes/header.html