Merge commit '6734c256525e1dd42ba3648db82083bcabca66ed'

Conflicts:
	manifests/dup.pp

diff --cc manifests/client.pp
Simple merge

diff --cc manifests/dup.pp
Simple merge

diff --cc manifests/rdiff.pp
index 1207cb14c98422b5b9748c6ef2ab2df08d9e90e1,579071bac4002ea603e6ccd6719eaf3361c438aa..98a74b29964353c65d4db691724cdcc54da940e0
--- 1/manifests/rdiff.pp
--- 2/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@@ -25,12 -25,9 +25,12 @@@ define backupninja::rdiff
                 "/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ],
    $vsinclude = false, $keep = 30, $sshoptions = false, $options = false, $ssh_dir_manage = true,
    $ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true,
-   $backuptag = false)
+   $backuptag = false, $home = false, $backupkeytype = '')
  {
    include backupninja::client
 +
 +  case $directory { false: { err("need to define a directory for where the backups should go!") } }
 +  
    case $type {
      'remote': {
        case $host { false: { err("need to define a host for remote backups!") } }