Fixes highlighted by puppet-lint.  Typos.  More changes to work properly with a non-home basedir.  Incorrect variables in templates.