added better logging
Merge branch 'master' of github.com:joewarren/jeffica

Conflicts:
	lib/nodeAction.js