Merge "Added support for salt engines, added support for requisite ordering"
diff --git a/_modules/virtng.py b/_modules/virtng.py
index 0a87e56..a79e5dd 100644
--- a/_modules/virtng.py
+++ b/_modules/virtng.py
@@ -9,6 +9,7 @@
 
 # Import python libs
 from __future__ import absolute_import
+import copy
 import os
 import re
 import sys
@@ -414,7 +415,7 @@
     else:
         overlay = {}
 
-    disklist = __salt__['config.get']('virt:disk', {}).get(profile, default)
+    disklist = copy.deepcopy(__salt__['config.get']('virt:disk', {}).get(profile, default))
     for key, val in overlay.items():
         for i, disks in enumerate(disklist):
             for disk in disks:
diff --git a/salt/files/master.conf b/salt/files/master.conf
index 3475762..d8952e9 100644
--- a/salt/files/master.conf
+++ b/salt/files/master.conf
@@ -141,6 +141,7 @@
   {%- endif %}
 {%- endif %}
 
+{%- if pillar.salt.get('minion') %}
 {%- for handler in pillar.salt.minion.get("handlers", []) %}
 {%- if handler.engine == "udp"%}
 
@@ -156,6 +157,7 @@
   version: 1
 {%- endif %}
 {%- endfor %}
+{%- endif %}
 
 {%- if master.get('order_masters', False) %}
 
diff --git a/salt/map.jinja b/salt/map.jinja
index ab40acf..5bc540c 100644
--- a/salt/map.jinja
+++ b/salt/map.jinja
@@ -28,7 +28,7 @@
 {%- load_yaml as master_specific %}
 Arch:
   pkgs:
-  - salt-zmq
+  - salt
 Debian:
   pkgs:
   - salt-master
@@ -91,7 +91,7 @@
 {%- load_yaml as minion_specific %}
 Arch:
   pkgs:
-  - salt-zmq
+  - salt
 Debian:
   pkgs:
   - salt-minion