Refactored config
Merge pull request #98 from troopjs/feature/more-config-refactor

Refactored config