Removed reliance on global.NODE_CONFIG
Updated History.md
Merge branch 'master' into empty-yaml-fix

Conflicts:
	lib/config.js