Merge pull request #826 from EllisLab/feature/abstract-config-load

Abstracting the loading of files in the config directory depending on environments