Changes_to_config_and_refactor

(based off of https://github.com/rackerlabs/otter/pull/260)