Merge branch 'hotfix/github-feed'
Use Zend\Config\Factory for merging config files

- Instead of manually doing so. Far simpler code!
Merge branch 'hotfix/config-merge' into develop