Merge pull request #11 from areese/fix_root_mess

Cleanup the building of directory names in preperation to remove the who...