Fix configuration errors from configlet.
Merge branch 'master' into cleanup-config

Conflicts:
	config.json
Merge pull request #13 from tmcgilchrist/cleanup-config

Cleanup configuration errors from configlet