merge sub/configs back into main config based on environment
Merge pull request #2 from colwilson/master

merge sub/configs back into main config based on environment