Clean up
Merge branch 'master' into gh-pages

Conflicts:
	README.md
	guides.html
	index.html
	walks.html
	where.html
Resolve
Merge branch 'gh-pages'