Added edit link and help instructions
Merge remote-tracking branch 'boilerplate/master' into gh-pages

Conflicts:
	_layouts/main.html