Merge branch 'production' into devel

manifests/init.pp

@@ -52,7 +52,6 @@ class aes {
   # Ideally, we would like to know if it is devel or production as well.
   exec { '/usr/bin/touch /var/last_puppet_run' : 
     cwd => "/var",
-    creates => "/var/last_puppet_run",
     user => root,
     group => root,
   }