Fix sanityinc/add-subdirs-to-load-path to only add subdirs
Merge pull request #228 from jguenther/fix-add-subdirs-to-load-path

Fix sanityinc/add-subdirs-to-load-path to only add subdirs
Merge remote branch 'purcell/master'