Added --include-path flag to git-completion and fixed up a couple of tests