More fixes related to #8
Merge branch 'master' of https://github.com/example42/puppet-vsftpd