Another constructor fix
Merge branch 'master' into express

Conflicts:
	src/node-template.coffee