Initial work for #5
Cleanup config implementation a little and mark bits left todo
Note a possible race condition
Add test for included configuration files
Documentation for "includes"
Merge branch 'features/config_file_includes' into develop