More small tweaks.
Merge branch 'akron/noctrl-cli' of github.com:flowgrammable/freeflow into akron/noctrl-cli

Conflicts:
	noctl/main.cpp