Restored usage of -p switch to htpasswd

[liquorvicar]

See discussion in https://github.com/example42/puppet-apache/pull/85 I believe that the previous change to alter the behaviour of the -p switch in htpasswd has broken the behaviour of this manifest and needs to be reversed.