Fix dependencies between optimist and config system.
Improving configs per jason
Fix typo in CONFIG
Merge branch 'master' into fix-config-dependencies

Conflicts:
	lib/config.js
Merge pull request #47 from mozilla/fix-config-dependencies

Fix config dependencies