#386: remove 'git/' subdirectory from haystack variable

Resolves #386.