diff --git a/bin/nova-api b/bin/nova-api
index 5ea49692c7..e9772ec810 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -2,7 +2,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/bin/nova-compute b/bin/nova-compute
index b1a6354b89..cc738e87f8 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -2,7 +2,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/bin/nova-instancemonitor b/bin/nova-instancemonitor
index d21732a152..1f22b424e3 100755
--- a/bin/nova-instancemonitor
+++ b/bin/nova-instancemonitor
@@ -2,7 +2,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/bin/nova-manage b/bin/nova-manage
index c9f36ad32c..f418e162ba 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -2,7 +2,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/bin/nova-objectstore b/bin/nova-objectstore
index 26dcd2676e..f6d7b12708 100755
--- a/bin/nova-objectstore
+++ b/bin/nova-objectstore
@@ -2,7 +2,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/bin/nova-volume b/bin/nova-volume
index f3f8cb9a49..2720e12cd1 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -2,7 +2,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/builddeb.sh b/builddeb.sh
index 5055dd3324..2fb20da2a3 100755
--- a/builddeb.sh
+++ b/builddeb.sh
@@ -2,7 +2,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/__init__.py b/nova/__init__.py
index 1151ee639a..1c886716f8 100644
--- a/nova/__init__.py
+++ b/nova/__init__.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/adminclient.py b/nova/adminclient.py
index ef1ee03c00..fe873b8f76 100644
--- a/nova/adminclient.py
+++ b/nova/adminclient.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/auth/__init__.py b/nova/auth/__init__.py
index bfc5ef4d56..0d115e9d9d 100644
--- a/nova/auth/__init__.py
+++ b/nova/auth/__init__.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/auth/fakeldap.py b/nova/auth/fakeldap.py
index 13b2435dd1..27dde314da 100644
--- a/nova/auth/fakeldap.py
+++ b/nova/auth/fakeldap.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/auth/novarc.template b/nova/auth/novarc.template
index 91a3c68c87..b6d65297ad 100644
--- a/nova/auth/novarc.template
+++ b/nova/auth/novarc.template
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/auth/rbac.py b/nova/auth/rbac.py
index eb85a3de1c..f4abd10750 100644
--- a/nova/auth/rbac.py
+++ b/nova/auth/rbac.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/auth/signer.py b/nova/auth/signer.py
index 526a54262b..4f7ac43bc3 100644
--- a/nova/auth/signer.py
+++ b/nova/auth/signer.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/auth/slap.sh b/nova/auth/slap.sh
index ac2af422f4..277ae2bcdd 100755
--- a/nova/auth/slap.sh
+++ b/nova/auth/slap.sh
@@ -2,7 +2,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/auth/users.py b/nova/auth/users.py
index 72c3c8466f..6997596aa2 100644
--- a/nova/auth/users.py
+++ b/nova/auth/users.py
@@ -2,7 +2,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/cloudpipe/__init__.py b/nova/cloudpipe/__init__.py
index 5c35d696c0..57ef146512 100644
--- a/nova/cloudpipe/__init__.py
+++ b/nova/cloudpipe/__init__.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/cloudpipe/api.py b/nova/cloudpipe/api.py
index 87283ef07b..610239c2e4 100644
--- a/nova/cloudpipe/api.py
+++ b/nova/cloudpipe/api.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/cloudpipe/bootscript.sh b/nova/cloudpipe/bootscript.sh
index 312258c22f..639aad66fb 100755
--- a/nova/cloudpipe/bootscript.sh
+++ b/nova/cloudpipe/bootscript.sh
@@ -2,7 +2,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/cloudpipe/client.ovpn.template b/nova/cloudpipe/client.ovpn.template
index 80b5dab261..a8ec5dc6e7 100644
--- a/nova/cloudpipe/client.ovpn.template
+++ b/nova/cloudpipe/client.ovpn.template
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py
index 106a313682..09da71c648 100644
--- a/nova/cloudpipe/pipelib.py
+++ b/nova/cloudpipe/pipelib.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/compute/__init__.py b/nova/compute/__init__.py
index fe8d357a38..1c688c1006 100644
--- a/nova/compute/__init__.py
+++ b/nova/compute/__init__.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/compute/disk.py b/nova/compute/disk.py
index 84329ae55e..e7090dad32 100644
--- a/nova/compute/disk.py
+++ b/nova/compute/disk.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/compute/exception.py b/nova/compute/exception.py
index 829810bb0f..b2bfc39e65 100644
--- a/nova/compute/exception.py
+++ b/nova/compute/exception.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/compute/fakevirtinstance.xml b/nova/compute/fakevirtinstance.xml
index 88cc623a85..0df76f5efb 100644
--- a/nova/compute/fakevirtinstance.xml
+++ b/nova/compute/fakevirtinstance.xml
@@ -1,6 +1,6 @@
 <!-- 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/compute/libvirt.xml.template b/nova/compute/libvirt.xml.template
index 9f40365a34..11dab7eb83 100644
--- a/nova/compute/libvirt.xml.template
+++ b/nova/compute/libvirt.xml.template
@@ -1,6 +1,6 @@
 <!-- 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/compute/linux_net.py b/nova/compute/linux_net.py
index 2ec1fe1835..14d7a1275e 100644
--- a/nova/compute/linux_net.py
+++ b/nova/compute/linux_net.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/compute/model.py b/nova/compute/model.py
index cd5ab40470..86f912f014 100644
--- a/nova/compute/model.py
+++ b/nova/compute/model.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/compute/monitor.py b/nova/compute/monitor.py
index 2d6911a892..c17cd0be47 100644
--- a/nova/compute/monitor.py
+++ b/nova/compute/monitor.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/compute/network.py b/nova/compute/network.py
index dc2ff77608..911d0344a4 100644
--- a/nova/compute/network.py
+++ b/nova/compute/network.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/compute/node.py b/nova/compute/node.py
index 1dd1621b05..c217056f54 100644
--- a/nova/compute/node.py
+++ b/nova/compute/node.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/crypto.py b/nova/crypto.py
index 1afe9a025d..80b4ef9dee 100644
--- a/nova/crypto.py
+++ b/nova/crypto.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/datastore.py b/nova/datastore.py
index 82a507468c..6b8a01ca57 100644
--- a/nova/datastore.py
+++ b/nova/datastore.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/endpoint/__init__.py b/nova/endpoint/__init__.py
index 4f98051a84..00ebd398c2 100644
--- a/nova/endpoint/__init__.py
+++ b/nova/endpoint/__init__.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/endpoint/admin.py b/nova/endpoint/admin.py
index d888820390..ccc0472af2 100644
--- a/nova/endpoint/admin.py
+++ b/nova/endpoint/admin.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/endpoint/api.py b/nova/endpoint/api.py
index 8cd10b9544..ece487b7bc 100755
--- a/nova/endpoint/api.py
+++ b/nova/endpoint/api.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py
index 193046c896..d6c164163f 100644
--- a/nova/endpoint/cloud.py
+++ b/nova/endpoint/cloud.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/endpoint/images.py b/nova/endpoint/images.py
index ba1c101c31..420b491f93 100644
--- a/nova/endpoint/images.py
+++ b/nova/endpoint/images.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/exception.py b/nova/exception.py
index 88fac44711..ebd85a5a78 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/fakerabbit.py b/nova/fakerabbit.py
index b2852bc50e..acb4d276c4 100644
--- a/nova/fakerabbit.py
+++ b/nova/fakerabbit.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/fakevirt.py b/nova/fakevirt.py
index 726df30249..aec2fe0ca9 100644
--- a/nova/fakevirt.py
+++ b/nova/fakevirt.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/flags.py b/nova/flags.py
index 1ed0785fb5..bf7b6e3a3e 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/objectstore/__init__.py b/nova/objectstore/__init__.py
index b4aa6f9283..25e9bf74a3 100644
--- a/nova/objectstore/__init__.py
+++ b/nova/objectstore/__init__.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/objectstore/bucket.py b/nova/objectstore/bucket.py
index fc8c1a0f33..a9dec5afbf 100644
--- a/nova/objectstore/bucket.py
+++ b/nova/objectstore/bucket.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/objectstore/handler.py b/nova/objectstore/handler.py
index cb062d146c..462ad90b1f 100644
--- a/nova/objectstore/handler.py
+++ b/nova/objectstore/handler.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/objectstore/image.py b/nova/objectstore/image.py
index 9cbe54a1ab..dc4667ec28 100644
--- a/nova/objectstore/image.py
+++ b/nova/objectstore/image.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/objectstore/stored.py b/nova/objectstore/stored.py
index 4c6ea649bd..fc656a0400 100644
--- a/nova/objectstore/stored.py
+++ b/nova/objectstore/stored.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/process.py b/nova/process.py
index 4792b26e7c..bc2d4474ba 100644
--- a/nova/process.py
+++ b/nova/process.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/rpc.py b/nova/rpc.py
index c7347156e6..54843973a0 100644
--- a/nova/rpc.py
+++ b/nova/rpc.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/server.py b/nova/server.py
index 376dbb1da1..49d5a1e892 100644
--- a/nova/server.py
+++ b/nova/server.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/test.py b/nova/test.py
index 4dd3775ef5..c226b43e7e 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py
index 3c24deeb3c..de4a3531a9 100644
--- a/nova/tests/__init__.py
+++ b/nova/tests/__init__.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/access_unittest.py b/nova/tests/access_unittest.py
index 5b5bc78348..fc2c192273 100644
--- a/nova/tests/access_unittest.py
+++ b/nova/tests/access_unittest.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/api_integration.py b/nova/tests/api_integration.py
index 02aec7120c..0216b16ec3 100644
--- a/nova/tests/api_integration.py
+++ b/nova/tests/api_integration.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/api_unittest.py b/nova/tests/api_unittest.py
index d6a1d09dea..a796ab41e9 100644
--- a/nova/tests/api_unittest.py
+++ b/nova/tests/api_unittest.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/cloud_unittest.py b/nova/tests/cloud_unittest.py
index 0a518de7a3..992fc8c90c 100644
--- a/nova/tests/cloud_unittest.py
+++ b/nova/tests/cloud_unittest.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/datastore_unittest.py b/nova/tests/datastore_unittest.py
index 78ea56f240..f4165a257c 100644
--- a/nova/tests/datastore_unittest.py
+++ b/nova/tests/datastore_unittest.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py
index 5614f6af8e..d40172cfcc 100644
--- a/nova/tests/fake_flags.py
+++ b/nova/tests/fake_flags.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/future_unittest.py b/nova/tests/future_unittest.py
index 4a46d8506a..af86f2788a 100644
--- a/nova/tests/future_unittest.py
+++ b/nova/tests/future_unittest.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/keeper_unittest.py b/nova/tests/keeper_unittest.py
index f53b1fe568..0a993afd70 100644
--- a/nova/tests/keeper_unittest.py
+++ b/nova/tests/keeper_unittest.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/network_unittest.py b/nova/tests/network_unittest.py
index 410fdf7a2f..f215c0b3ff 100644
--- a/nova/tests/network_unittest.py
+++ b/nova/tests/network_unittest.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/node_unittest.py b/nova/tests/node_unittest.py
index 91927c35a3..44c8d04217 100644
--- a/nova/tests/node_unittest.py
+++ b/nova/tests/node_unittest.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/objectstore_unittest.py b/nova/tests/objectstore_unittest.py
index 1f468dcfea..89c1d59c50 100644
--- a/nova/tests/objectstore_unittest.py
+++ b/nova/tests/objectstore_unittest.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/process_unittest.py b/nova/tests/process_unittest.py
index 24fad4d1d2..4e891fca7a 100644
--- a/nova/tests/process_unittest.py
+++ b/nova/tests/process_unittest.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/real_flags.py b/nova/tests/real_flags.py
index c7ab10d6f5..b30987f1ee 100644
--- a/nova/tests/real_flags.py
+++ b/nova/tests/real_flags.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/storage_unittest.py b/nova/tests/storage_unittest.py
index 593ac16f13..73215c5ca5 100644
--- a/nova/tests/storage_unittest.py
+++ b/nova/tests/storage_unittest.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/users_unittest.py b/nova/tests/users_unittest.py
index d42095f0cf..6e4b9d9df2 100644
--- a/nova/tests/users_unittest.py
+++ b/nova/tests/users_unittest.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/tests/validator_unittest.py b/nova/tests/validator_unittest.py
index 032162dff8..6ebce0994a 100644
--- a/nova/tests/validator_unittest.py
+++ b/nova/tests/validator_unittest.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/twistd.py b/nova/twistd.py
index 566b50c56c..44a19e9dcd 100644
--- a/nova/twistd.py
+++ b/nova/twistd.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/utils.py b/nova/utils.py
index 3339bc940e..325b062eea 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/validate.py b/nova/validate.py
index 9d89836a1e..820546b731 100644
--- a/nova/validate.py
+++ b/nova/validate.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/vendor.py b/nova/vendor.py
index bb17fe1298..77bfe4be50 100644
--- a/nova/vendor.py
+++ b/nova/vendor.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/volume/__init__.py b/nova/volume/__init__.py
index 82e387a4a6..ad2181525f 100644
--- a/nova/volume/__init__.py
+++ b/nova/volume/__init__.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/nova/volume/storage.py b/nova/volume/storage.py
index f2c250e860..1401aef1dd 100644
--- a/nova/volume/storage.py
+++ b/nova/volume/storage.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/run_tests.py b/run_tests.py
index bcbb29c621..aea766c92c 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/setup.py b/setup.py
index 327e455c5d..95d0ee7d1d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/smoketests/__init__.py b/smoketests/__init__.py
index 288c1a42ca..ddd6919a09 100644
--- a/smoketests/__init__.py
+++ b/smoketests/__init__.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/smoketests/flags.py b/smoketests/flags.py
index c08ba5a752..6c2131d70b 100644
--- a/smoketests/flags.py
+++ b/smoketests/flags.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/smoketests/novatestcase.py b/smoketests/novatestcase.py
index 7de4288f32..869e319460 100644
--- a/smoketests/novatestcase.py
+++ b/smoketests/novatestcase.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/smoketests/smoketest.py b/smoketests/smoketest.py
index 47c34ef6f1..26e167c8f1 100644
--- a/smoketests/smoketest.py
+++ b/smoketests/smoketest.py
@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC
diff --git a/tools/clean-vlans b/tools/clean-vlans
index 7e4f5e5388..c345de9127 100755
--- a/tools/clean-vlans
+++ b/tools/clean-vlans
@@ -2,7 +2,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. 
+# Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
 # Copyright 2010 Anso Labs, LLC