logging fix
Merge branch 'master' of https://github.com/rweigel/expandtemplate

Conflicts:
	lib/expandtemplate.js
various