Rebasing to strip out whitespace
Merge branch 'parallel-filesystems' into fs-detection
Changing getpath to be compositional