Merge pull request #2 from huntc/repos-settings

Minor changes to do with repos and setting declarations
Updates from review
Added test for include paths