Updated htpasswd template to use a different password attribute
Merge branch 'master' of github.com:biola/chef-cookbooks