Merge branch 'feature/torification-exception' into old-master

diff --cc README
Simple merge

diff --cc manifests/init.pp
index 3b4b3b26a17d7866106e68a58334796f9ccfb99a,e5456d0d34bef02c6ca4ced46174b74459f7d90b..dd287678a3969bb7b0409b36b69c40b1b3b9f635
--- 1/manifests/init.pp
--- 2/manifests/init.pp
+++ b/manifests/init.pp
@@@ -33,7 -34,17 +33,11 @@@ class shorewall
        default => $dist_tor_user,
      }
    }
+   case $non_torified_users {
+     '': { $non_torified_users = [] }
+   }
+   $real_non_torified_users = uniq_flatten([ $tor_user, $non_torified_users ])
  
 -  file {"/var/lib/puppet/modules/shorewall":
 -    ensure => directory,
 -    force => true,
 -    owner => root, group => 0, mode => 0755; 
 -  }
 -
    # See http://www.shorewall.net/3.0/Documentation.htm#Zones
    shorewall::managed_file{ zones: }
    # See http://www.shorewall.net/3.0/Documentation.htm#Interfaces