diff --git a/conf/pkgs/general.json b/conf/pkgs/general.json
index 9f60522f..19837714 100644
--- a/conf/pkgs/general.json
+++ b/conf/pkgs/general.json
@@ -119,12 +119,12 @@
             "removable": false, 
             "version": "7.19.7*"
         }, 
-        # Only for testing client
-        # Requires EPEL
         "euca2ools": {
             "removable": false, 
-            # This version is most likely way to old!
-            "version": "1.3.1*"
+            "version": "1.3.1*",
+            "meta": {
+                "epel" : true
+            }
         }, 
         "git": {
             "removable": false, 
@@ -152,66 +152,77 @@
             "removable": false, 
             "version": "5.3*"
         }, 
-        # Requires EPEL
         "python-pep8": {
             "removable": false, 
-            "version": "0.6*"
+            "version": "0.6*",
+            "meta": {
+                "epel" : true
+            }
         }, 
         "psmisc": {
             "removable": false, 
             "version": "22.6*"
         }, 
-        # Requires EPEL
         "pylint": {
             "removable": false, 
-            "version": "0.21*"
+            "version": "0.21*",
+            "meta": {
+                "epel" : true
+            }
         }, 
         "python": {
             "removable": false, 
             "version": "2.6*"
         }, 
-        # Requires EPEL
         "python-pip": {
             "removable": false, 
-            "version": "0.8*"
+            "version": "0.8*",
+            "meta": {
+                "epel" : true
+            }
         }, 
-        # For testing
-        # Requires EPEL
         "python-unittest2": {
             "removable": false, 
-            "version": "0.5.1*"
+            "version": "0.5.1*",
+            "meta": {
+                "epel" : true
+            }
         }, 
-        # For testing
-        # Requires EPEL
         "python-virtualenv": {
             "removable": false, 
-            "version": "1.7*"
+            "version": "1.7*",
+            "meta": {
+                "epel" : true
+            }
         }, 
         "python-setuptools": {
             "version": "0.6.10*",
             "removable": false
         },
-        # Requires EPEL
         "python-distutils-extra": {
             "version": "2.29*",
-            "removable": false
+            "removable": false,
+            "meta": {
+                "epel" : true
+            }
         },
-        # For venv
         "python-devel": {
             "version": "2.6*",
             "removable": false
         },
-        # For testing
-        # Requires EPEL
         "python-nose1.1": {
             "version": "1.1*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
-        # For testing
-        # Requires EPEL
         "python-mox": {
             "version": "0.5.3*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
         "screen": {
             "removable": false, 
diff --git a/conf/pkgs/glance.json b/conf/pkgs/glance.json
index 28b19b93..3a30ed59 100644
--- a/conf/pkgs/glance.json
+++ b/conf/pkgs/glance.json
@@ -51,20 +51,26 @@
         }
     },
     "rhel-6": {
-        # Requires EPEL
         "python-eventlet": {
             "version": "0.9*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
-        # Requires EPEL
         "python-greenlet": {
             "version": "0.3.1*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
-        # Requires EPEL
         "python-argparse": {
             "version": "1.2*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
         "MySQL-python": {
             "version": "1.2*",
@@ -74,22 +80,26 @@
             "version": "1.4*",
             "removable": true
         },
-        # Requires EPEL
         "python-prettytable": {
             "version": "0.5*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
-        # Requires EPEL
         "python-xattr": {
-            # This might be way to old :(
             "version": "0.5*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
-        # Requires EPEL
         "python-httplib2": {
-            # This might be way to old :(
             "version": "0.4*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         }
     },
     "fedora-16": {
diff --git a/conf/pkgs/horizon.json b/conf/pkgs/horizon.json
index 85c4148d..94550568 100644
--- a/conf/pkgs/horizon.json
+++ b/conf/pkgs/horizon.json
@@ -94,20 +94,26 @@
             "version": "1.7.4*",
             "removable": true
         },
-        # Requires EPEL
         "python-webob1.0": {
             "version": "1.0*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
-        # Requires EPEL
         "python-kombu": {
             "version": "1.1*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
-        # Requires EPEL
         "python-eventlet": {
             "version": "0.9*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         }
     },
     # initially stolen from ubuntu-oneric
diff --git a/conf/pkgs/keystone-client.json b/conf/pkgs/keystone-client.json
index 75220dab..2a62bbd9 100644
--- a/conf/pkgs/keystone-client.json
+++ b/conf/pkgs/keystone-client.json
@@ -15,15 +15,19 @@
         }
     },
     "rhel-6": {
-        # Requires EPEL
         "python-argparse": {
             "version": "1.2*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
-        # Requires EPEL
         "python-prettytable": {
             "version": "0.5*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         }
     },
     "fedora-16": {
diff --git a/conf/pkgs/keystone.json b/conf/pkgs/keystone.json
index 77ff0730..f43087c3 100644
--- a/conf/pkgs/keystone.json
+++ b/conf/pkgs/keystone.json
@@ -76,10 +76,12 @@
         }
     },
     "rhel-6": {
-        # Requires EPEL
         "python-eventlet": {
             "version": "0.9*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
         "python-lxml": {
             # Trashes IPA client, which is probably bad
@@ -90,10 +92,12 @@
             "version": "1.7*",
             "removable": true
         },
-        # Requires EPEL
         "python-prettytable": {
             "version": "0.5*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
         "MySQL-python": {
             "version": "1.2*",
@@ -108,31 +112,40 @@
             # Trashes alot of the base os (so we don't allow it to be removed)
             "removable": false
         },
-        # Requires EPEL
         "python-sqlite2": {
-            # This might be way to old :(
             "version": "2.3*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
-        # Requires EPEL
         "python-webob1.0": {
             "version": "1.0*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
-        # Requires EPEL
         "python-argparse": {
             "version": "1.2*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
-        # Requires EPEL
         "python-greenlet": {
             "version": "0.3.1*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
-        # Requires EPEL
         "python-passlib": {
             "version": "1.5*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
         "openldap": {
             # Trashes alot of the base os (so we don't allow it to be removed)
diff --git a/conf/pkgs/n-vnc.json b/conf/pkgs/n-vnc.json
index b4e97d2e..5fa3f78c 100644
--- a/conf/pkgs/n-vnc.json
+++ b/conf/pkgs/n-vnc.json
@@ -13,12 +13,6 @@
         }
     },
     "rhel-6": {
-        # This doesn't work yet, since it conflicts with the 
-        # Symlink we are making for python-nose1.1 from EPEL
-        #"numpy": {
-        #    "version": "1.3*",
-        #    "removable": true
-        #}
     },
     "fedora-16": {
         "numpy": {
diff --git a/conf/pkgs/nova-client.json b/conf/pkgs/nova-client.json
index 3d5e65d0..927edb82 100644
--- a/conf/pkgs/nova-client.json
+++ b/conf/pkgs/nova-client.json
@@ -15,15 +15,19 @@
         }
     },
     "rhel-6": {
-        # Requires EPEL
         "python-argparse": {
             "version": "1.2*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
-        # Requires EPEL
         "python-prettytable": {
             "version": "0.5*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         }
     },
     "fedora-16": {
diff --git a/conf/pkgs/nova.json b/conf/pkgs/nova.json
index 58d6f8a4..11e41b77 100644
--- a/conf/pkgs/nova.json
+++ b/conf/pkgs/nova.json
@@ -170,10 +170,12 @@
             "removable": true
         },
         # Needed for glance which is needed for nova --- this shouldn't be here
-        # Requires EPEL
         "pyxattr": {
             "version": "0.5*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
         # Needed for glance which is needed for nova --- this shouldn't be here
         "python-lxml": {
@@ -199,27 +201,32 @@
         #     "removable": true
         # },
         # Used by ajaxterm
-        # Requires EPEL
         "socat": {
             "version": "1.7*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
         "python-paste": {
             "version": "1.7.4*",
             "removable": true
         },
-        # Requires EPEL
         "python-gflags": {
             "version": "1.4*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
-        # Requires EPEL
         "python-greenlet": {
             "version": "0.3.1*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
         # This seems to kill RHN/yum if its removed ??
-        # TODO verify
         "libxml2-python": {
             "version": "2.7*",
             "removable": false
@@ -228,47 +235,59 @@
             "version": "0.7*",
             "removable": true
         },
-        # Requires EPEL
         "python-eventlet": {
             "version": "0.9*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
         "python-cheetah": {
             "version": "2.4*",
             "removable": true
         },
-        # Requires EPEL
         "python-carrot": {
             "version": "0.10*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
         "python-suds": {
             "version": "0.4*",
             "removable": true
         },
-        # Requires EPEL
         "python-lockfile": {
             "version": "0.8*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
         "python-crypto": {
             "version": "2.0*",
             "removable": false
         },
-        # Requires EPEL
         "python-boto": {
             "version": "2.0*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
-        # Requires EPEL
         "python-kombu": {
             "version": "1.1*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         },
-        # Requires EPEL
         "python-feedparser": {
             "version": "5.0*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         }
     },
     "fedora-16": {
diff --git a/conf/pkgs/quantum-client.json b/conf/pkgs/quantum-client.json
index 845f4256..709624fd 100644
--- a/conf/pkgs/quantum-client.json
+++ b/conf/pkgs/quantum-client.json
@@ -11,10 +11,12 @@
         }
     },
     "rhel-6": {
-        # Requires EPEL
         "python-gflags": {
             "version": "1.4*",
-            "removable": true
+            "removable": true,
+            "meta": {
+                "epel" : true
+            }
         }
     },
     "fedora-16": {
diff --git a/conf/pkgs/rabbitmq.json b/conf/pkgs/rabbitmq.json
index 013c9f2b..8da5aa49 100644
--- a/conf/pkgs/rabbitmq.json
+++ b/conf/pkgs/rabbitmq.json
@@ -11,10 +11,12 @@
         }
     },
     "rhel-6": {
-        # Requires EPEL
         "rabbitmq-server": {
             "version": "2.6*",
             "removable": true,
+            "meta": {
+                "epel" : true
+            },
             "pre-install": [
                 {
                     # Qpidd runs on the same port
diff --git a/conf/pkgs/swift.json b/conf/pkgs/swift.json
index c0ca4ea1..caad428a 100644
--- a/conf/pkgs/swift.json
+++ b/conf/pkgs/swift.json
@@ -42,9 +42,9 @@
             "version": "3.7*",
             "removable": true
         },
-	"xfsprogs": {
+        "xfsprogs": {
             "version": "3.1*",
-	    "removable": true
+            "removable": true
         }
     },
     "rhel-6": {