Initial config refactor
Merge pull request #81 from scobal/config_refactor

Initial config refactor