add .gitignore
fix zrs options to be templated and better handle recipe names with version requirements
Merge branch 'master' into HEAD
update docs
Merge commit '8eb35c3' into multi-server-address

Conflicts:
	.gitignore
	collective/recipe/filestorage/README.txt