Merge remote-tracking branch 'origin/gh-pages'
Merge branch 'gh-pages'
Clean up
Merge branch 'master' into gh-pages

Conflicts:
	README.md
	guides.html
	index.html
	walks.html
	where.html