Getting rid of redundancies and making more settings configurable via
the simple properties at the top of the config file.
Merge pull request #144 from kris-sigur/conf-fix

Verified locally; merging.