Allowing configuration through _config.yml
Folders back to normal
Merge remote-tracking branch 'kelvinst/config' into develop