New configuration options

Added new configuration options to the config.yml that are useful on
multiple servers without rewriting everything from scratch.

New TODOs