Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object