Logging fixes
Fix for logging.
Merge branch 'master' of https://github.com/rweigel/tsdset

Conflicts:
	lib/expandtemplate.js