Parameterize homedir for non-standard directories
Parameterize group name
Fix typo
Merge branch 'joedj-master'