more allowed characters for mustache parameter names
more git ignores
Merge branch '3.2'

Conflicts:
	.gitignore
npm requires "name" and "version" of package now