Switched to new config style.
Renamed Content.yml to Content__.yml so it won't get picked up by default.
Merge branch 'feature/ConfigCleanup' into develop