diff --git a/devstack/__init__.py b/devstack/__init__.py
index e8e40359..a7bfb005 100644
--- a/devstack/__init__.py
+++ b/devstack/__init__.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/cfg.py b/devstack/cfg.py
index 25b70554..364a8eb0 100644
--- a/devstack/cfg.py
+++ b/devstack/cfg.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/component.py b/devstack/component.py
index 7ea5743a..7859a154 100644
--- a/devstack/component.py
+++ b/devstack/component.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/components/__init__.py b/devstack/components/__init__.py
index e8e40359..a7bfb005 100644
--- a/devstack/components/__init__.py
+++ b/devstack/components/__init__.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/components/db.py b/devstack/components/db.py
index 2b82ce98..319e7f12 100644
--- a/devstack/components/db.py
+++ b/devstack/components/db.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/components/glance.py b/devstack/components/glance.py
index 7b3c360a..23b82b0f 100644
--- a/devstack/components/glance.py
+++ b/devstack/components/glance.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/components/horizon.py b/devstack/components/horizon.py
index b79f8240..795356ca 100644
--- a/devstack/components/horizon.py
+++ b/devstack/components/horizon.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/components/keystone.py b/devstack/components/keystone.py
index 9dbdc6d8..c63e878c 100644
--- a/devstack/components/keystone.py
+++ b/devstack/components/keystone.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/components/keystone_client.py b/devstack/components/keystone_client.py
index 52de2cd5..92341247 100644
--- a/devstack/components/keystone_client.py
+++ b/devstack/components/keystone_client.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
@@ -13,7 +14,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
 from devstack import component as comp
 from devstack import log as logging
 from devstack import settings
diff --git a/devstack/components/nova.py b/devstack/components/nova.py
index 083452cf..114d4246 100644
--- a/devstack/components/nova.py
+++ b/devstack/components/nova.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/components/nova_client.py b/devstack/components/nova_client.py
index 776f20b1..54b80e04 100644
--- a/devstack/components/nova_client.py
+++ b/devstack/components/nova_client.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/components/novnc.py b/devstack/components/novnc.py
index da600afa..5e1d9078 100644
--- a/devstack/components/novnc.py
+++ b/devstack/components/novnc.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/components/openstack_x.py b/devstack/components/openstack_x.py
index 36e0796e..7a835e9e 100644
--- a/devstack/components/openstack_x.py
+++ b/devstack/components/openstack_x.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/components/quantum.py b/devstack/components/quantum.py
index 676523af..e110de4c 100644
--- a/devstack/components/quantum.py
+++ b/devstack/components/quantum.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/components/rabbit.py b/devstack/components/rabbit.py
index 6068f844..d5847cd3 100644
--- a/devstack/components/rabbit.py
+++ b/devstack/components/rabbit.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
@@ -13,7 +14,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
 from tempfile import TemporaryFile
 
 from devstack import component as comp
diff --git a/devstack/components/swift.py b/devstack/components/swift.py
index 6930553c..ae8f5543 100644
--- a/devstack/components/swift.py
+++ b/devstack/components/swift.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
@@ -13,7 +14,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
 from devstack import component as comp
 from devstack import log as logging
 from devstack import settings
diff --git a/devstack/date.py b/devstack/date.py
index 19657a09..d5d27f6d 100644
--- a/devstack/date.py
+++ b/devstack/date.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/downloader.py b/devstack/downloader.py
index e8966085..1ee29040 100644
--- a/devstack/downloader.py
+++ b/devstack/downloader.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/env.py b/devstack/env.py
index c55f4a97..3c5d7c38 100644
--- a/devstack/env.py
+++ b/devstack/env.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/exceptions.py b/devstack/exceptions.py
index 07ab5399..2f1c40c8 100644
--- a/devstack/exceptions.py
+++ b/devstack/exceptions.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/image/__init__.py b/devstack/image/__init__.py
index e8e40359..a7bfb005 100644
--- a/devstack/image/__init__.py
+++ b/devstack/image/__init__.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/image/creator.py b/devstack/image/creator.py
index 63cf4561..937bab50 100644
--- a/devstack/image/creator.py
+++ b/devstack/image/creator.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
@@ -13,7 +14,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
 import os
 import tarfile
 import tempfile
diff --git a/devstack/log.py b/devstack/log.py
index 9d32c7b9..ac3bd961 100644
--- a/devstack/log.py
+++ b/devstack/log.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/opts.py b/devstack/opts.py
index 12f6ffbe..5c55e435 100644
--- a/devstack/opts.py
+++ b/devstack/opts.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/packager.py b/devstack/packager.py
index 1f8b36c5..bfb9878b 100644
--- a/devstack/packager.py
+++ b/devstack/packager.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/packaging/__init__.py b/devstack/packaging/__init__.py
index e8e40359..a7bfb005 100644
--- a/devstack/packaging/__init__.py
+++ b/devstack/packaging/__init__.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/packaging/apt.py b/devstack/packaging/apt.py
index 13e850bb..bc4211fc 100644
--- a/devstack/packaging/apt.py
+++ b/devstack/packaging/apt.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/packaging/yum.py b/devstack/packaging/yum.py
index 5661a2bb..b572c949 100644
--- a/devstack/packaging/yum.py
+++ b/devstack/packaging/yum.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/pip.py b/devstack/pip.py
index 7f8d7f34..22921633 100644
--- a/devstack/pip.py
+++ b/devstack/pip.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/progs/__init__.py b/devstack/progs/__init__.py
index e8e40359..a7bfb005 100644
--- a/devstack/progs/__init__.py
+++ b/devstack/progs/__init__.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/progs/actions.py b/devstack/progs/actions.py
index 1ec39acd..fed2216c 100644
--- a/devstack/progs/actions.py
+++ b/devstack/progs/actions.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
@@ -11,7 +12,7 @@
 #    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
-#    under the License.
+#    under the License..
 
 #requires http://pypi.python.org/pypi/termcolor
 #but the colors make it worth it :-)
diff --git a/devstack/progs/misc.py b/devstack/progs/misc.py
index 0fda9e7f..a2fd1d0d 100644
--- a/devstack/progs/misc.py
+++ b/devstack/progs/misc.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
@@ -37,6 +38,7 @@ from devstack.components import swift
 
 PROG_NAME = "MISC"
 
+#this determines how descriptions for components are found
 _DESCR_MAP = {
     settings.DB: db.describe,
     settings.GLANCE: glance.describe,
diff --git a/devstack/runners/__init__.py b/devstack/runners/__init__.py
index e8e40359..a7bfb005 100644
--- a/devstack/runners/__init__.py
+++ b/devstack/runners/__init__.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/runners/fork.py b/devstack/runners/fork.py
index a00501b6..da054521 100644
--- a/devstack/runners/fork.py
+++ b/devstack/runners/fork.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/runners/screen.py b/devstack/runners/screen.py
index 316328d0..1eb5f57c 100644
--- a/devstack/runners/screen.py
+++ b/devstack/runners/screen.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/settings.py b/devstack/settings.py
index 4522d008..82140a6f 100644
--- a/devstack/settings.py
+++ b/devstack/settings.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/shell.py b/devstack/shell.py
index 1156fbbb..c9066836 100644
--- a/devstack/shell.py
+++ b/devstack/shell.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/trace.py b/devstack/trace.py
index 7c7ec6bb..9392e9c9 100644
--- a/devstack/trace.py
+++ b/devstack/trace.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/utils.py b/devstack/utils.py
index b1c06fdb..304c909a 100644
--- a/devstack/utils.py
+++ b/devstack/utils.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/devstack/version.py b/devstack/version.py
index f6f7f8b6..b7f7284d 100644
--- a/devstack/version.py
+++ b/devstack/version.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/stack b/stack
index 50f54fd3..f615b516 100755
--- a/stack
+++ b/stack
@@ -1,5 +1,6 @@
-#!/usr/bin/env python
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain