Merge pull request #14 from PeterJCLaw/fix-duplicate-package

Fix #12: Avoid duplicate package errors by virtualising them
Merge pull request #13 from PeterJCLaw/fix-templates

More puppet 3 templates fixes
Fix package specification on Fedora 20.

In F20 at least nss_ldap doesn't exist any longer, so remove it.
Add LDAP/PAM option for allowing local user logins

Because LDAP manages PAM (hhhnnnggg) this is where we have to configure
PAM. The only difference between ldap's default configuration and
optimus' is that local (/etc/passwd) users are allowed to login, so add
an option to enable that behaviour.
Merge branch 'fedora-20' into srobo-tweaks+f20