Improve documentation tools
Merge branch 'master' of https://github.com/tpetricek/FSharp.ProjectScaffold into tpetricek-master

Conflicts:
	docs/tools/generate.fsx