using directory instead of folder consistently; also fixing a few remaining mysite base directory references
typo
small tweak
Merge branch 'hotfix/directory_consitency'
merging
Merge pull request #81 from BluesFiend/hotfix/directory_consitency

folder/directory consitency