Moved variable to where it's used
Renamed variables for clarity
This only worked because dirs is a reference to argv._. Use dirs consistently and make clear in which case we fall back to the default
Minor textual fixes
Merge branch 'master' into some-cleanup
Minor cleanup by JP