Changed from boolean map to struct{} map.
Updated README.md to show the config file more nicely.
Simplification suggested by golint.
Merge remote-tracking branch 'origin/master'