Remove extraneous vim configuration comments

Remove vim setting, Remove line containing:
comment - # vim: tabstop=4 shiftwidth=4 softtabstop=4

at the top of source code files, except for files in
openstack/common.

Change-Id: I5e2aad6dca8407890fc3c2afbda541bd4f124ea8
Closes-Bug: #1229324

100 files changed, 1 insertions, 191 deletions

diff --git a/rsdns/__init__.py b/rsdns/__init__.py
index eb664c88..96445cd0 100644
--- a/rsdns/__init__.py
+++ b/rsdns/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/run_tests.sh b/run_tests.sh
index d05d2742..94f47770 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 set -eu
 
diff --git a/tools/install_venv.py b/tools/install_venv.py
index e25bed82..3af55bce 100755
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
diff --git a/trove/__init__.py b/trove/__init__.py
index b3bc3ec7..8b9fc79c 100644
--- a/trove/__init__.py
+++ b/trove/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/backup/service.py b/trove/backup/service.py
index 6c3a41ef..6fb52f66 100644
--- a/trove/backup/service.py
+++ b/trove/backup/service.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # Copyright 2013 Hewlett-Packard Development Company, L.P.
 #
diff --git a/trove/backup/views.py b/trove/backup/views.py
index e212b35c..f35322e7 100644
--- a/trove/backup/views.py
+++ b/trove/backup/views.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/cmd/conductor.py b/trove/cmd/conductor.py
index ea5204e7..0a1eff2b 100755
--- a/trove/cmd/conductor.py
+++ b/trove/cmd/conductor.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2013 Rackspace Hosting
 # All Rights Reserved.
diff --git a/trove/cmd/fakemode.py b/trove/cmd/fakemode.py
index 8a5aa61b..d16a26d8 100755
--- a/trove/cmd/fakemode.py
+++ b/trove/cmd/fakemode.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
diff --git a/trove/cmd/guest.py b/trove/cmd/guest.py
index 456342a8..3731ae72 100755
--- a/trove/cmd/guest.py
+++ b/trove/cmd/guest.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
diff --git a/trove/cmd/manage.py b/trove/cmd/manage.py
index ad1bcc5a..bfe684f6 100755
--- a/trove/cmd/manage.py
+++ b/trove/cmd/manage.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
diff --git a/trove/cmd/taskmanager.py b/trove/cmd/taskmanager.py
index 2f3d43f0..c7e13696 100755
--- a/trove/cmd/taskmanager.py
+++ b/trove/cmd/taskmanager.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
diff --git a/trove/common/auth.py b/trove/common/auth.py
index bac24ad6..81142f03 100644
--- a/trove/common/auth.py
+++ b/trove/common/auth.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/common/cfg.py b/trove/common/cfg.py
index 22a36c9e..45eba1de 100644
--- a/trove/common/cfg.py
+++ b/trove/common/cfg.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # Copyright 2014 Rackspace Hosting
 # All Rights Reserved.
diff --git a/trove/common/context.py b/trove/common/context.py
index 014aa50c..be9f9652 100644
--- a/trove/common/context.py
+++ b/trove/common/context.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/common/debug_utils.py b/trove/common/debug_utils.py
index 78582d58..3b1b5001 100644
--- a/trove/common/debug_utils.py
+++ b/trove/common/debug_utils.py
@@ -1,4 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4 Copyright 2011 OpenStack Foundation
+# Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not
diff --git a/trove/common/exception.py b/trove/common/exception.py
index 9dcad5ae..5fac9004 100644
--- a/trove/common/exception.py
+++ b/trove/common/exception.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/common/extensions.py b/trove/common/extensions.py
index 22ec04e1..e68e63c2 100644
--- a/trove/common/extensions.py
+++ b/trove/common/extensions.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/common/instance.py b/trove/common/instance.py
index c6910268..29a30678 100644
--- a/trove/common/instance.py
+++ b/trove/common/instance.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/common/models.py b/trove/common/models.py
index 84bff2e8..9f87c226 100644
--- a/trove/common/models.py
+++ b/trove/common/models.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/common/pagination.py b/trove/common/pagination.py
index 1aac438c..eee36be7 100644
--- a/trove/common/pagination.py
+++ b/trove/common/pagination.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/common/remote.py b/trove/common/remote.py
index a8c2da2f..7f7a403d 100644
--- a/trove/common/remote.py
+++ b/trove/common/remote.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/common/rpc/__init__.py b/trove/common/rpc/__init__.py
index 8a395d1c..d117c9af 100644
--- a/trove/common/rpc/__init__.py
+++ b/trove/common/rpc/__init__.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
diff --git a/trove/common/rpc/impl_fake.py b/trove/common/rpc/impl_fake.py
index 0b5b0fe8..c7852cc9 100644
--- a/trove/common/rpc/impl_fake.py
+++ b/trove/common/rpc/impl_fake.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/common/utils.py b/trove/common/utils.py
index 3db2a3ba..b663df45 100644
--- a/trove/common/utils.py
+++ b/trove/common/utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/common/views.py b/trove/common/views.py
index b00b607a..677d0977 100644
--- a/trove/common/views.py
+++ b/trove/common/views.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/common/wsgi.py b/trove/common/wsgi.py
index 5868c868..9916b39f 100644
--- a/trove/common/wsgi.py
+++ b/trove/common/wsgi.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/db/__init__.py b/trove/db/__init__.py
index 3d9e0873..0901d90a 100644
--- a/trove/db/__init__.py
+++ b/trove/db/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/db/sqlalchemy/api.py b/trove/db/sqlalchemy/api.py
index e64e525a..afe03b02 100644
--- a/trove/db/sqlalchemy/api.py
+++ b/trove/db/sqlalchemy/api.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/db/sqlalchemy/mappers.py b/trove/db/sqlalchemy/mappers.py
index 0b260f76..6c80a549 100644
--- a/trove/db/sqlalchemy/mappers.py
+++ b/trove/db/sqlalchemy/mappers.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/db/sqlalchemy/migrate_repo/manage.py b/trove/db/sqlalchemy/migrate_repo/manage.py
index 1654260f..f61b116a 100644
--- a/trove/db/sqlalchemy/migrate_repo/manage.py
+++ b/trove/db/sqlalchemy/migrate_repo/manage.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
diff --git a/trove/db/sqlalchemy/migrate_repo/schema.py b/trove/db/sqlalchemy/migrate_repo/schema.py
index defe5198..3b7bd18f 100644
--- a/trove/db/sqlalchemy/migrate_repo/schema.py
+++ b/trove/db/sqlalchemy/migrate_repo/schema.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/db/sqlalchemy/migrate_repo/versions/001_base_schema.py b/trove/db/sqlalchemy/migrate_repo/versions/001_base_schema.py
index 0c0dd05b..74113452 100644
--- a/trove/db/sqlalchemy/migrate_repo/versions/001_base_schema.py
+++ b/trove/db/sqlalchemy/migrate_repo/versions/001_base_schema.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/db/sqlalchemy/migrate_repo/versions/002_service_images.py b/trove/db/sqlalchemy/migrate_repo/versions/002_service_images.py
index 4ad2d07b..b82eb5c5 100644
--- a/trove/db/sqlalchemy/migrate_repo/versions/002_service_images.py
+++ b/trove/db/sqlalchemy/migrate_repo/versions/002_service_images.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/db/sqlalchemy/migrate_repo/versions/003_service_statuses.py b/trove/db/sqlalchemy/migrate_repo/versions/003_service_statuses.py
index 2a0f0635..76f04955 100644
--- a/trove/db/sqlalchemy/migrate_repo/versions/003_service_statuses.py
+++ b/trove/db/sqlalchemy/migrate_repo/versions/003_service_statuses.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/db/sqlalchemy/migrate_repo/versions/004_root_enabled.py b/trove/db/sqlalchemy/migrate_repo/versions/004_root_enabled.py
index bef7bf51..6fd6f126 100644
--- a/trove/db/sqlalchemy/migrate_repo/versions/004_root_enabled.py
+++ b/trove/db/sqlalchemy/migrate_repo/versions/004_root_enabled.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/db/sqlalchemy/migrate_repo/versions/005_heartbeat.py b/trove/db/sqlalchemy/migrate_repo/versions/005_heartbeat.py
index 96abc876..57aa7f7b 100644
--- a/trove/db/sqlalchemy/migrate_repo/versions/005_heartbeat.py
+++ b/trove/db/sqlalchemy/migrate_repo/versions/005_heartbeat.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/db/sqlalchemy/migrate_repo/versions/006_dns_records.py b/trove/db/sqlalchemy/migrate_repo/versions/006_dns_records.py
index 36f14a4a..0afd5a8d 100644
--- a/trove/db/sqlalchemy/migrate_repo/versions/006_dns_records.py
+++ b/trove/db/sqlalchemy/migrate_repo/versions/006_dns_records.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/db/sqlalchemy/migrate_repo/versions/010_add_usage.py b/trove/db/sqlalchemy/migrate_repo/versions/010_add_usage.py
index f54b2236..0e4fdfc2 100644
--- a/trove/db/sqlalchemy/migrate_repo/versions/010_add_usage.py
+++ b/trove/db/sqlalchemy/migrate_repo/versions/010_add_usage.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/db/sqlalchemy/migrate_repo/versions/013_add_security_group_artifacts.py b/trove/db/sqlalchemy/migrate_repo/versions/013_add_security_group_artifacts.py
index 44f0a71e..41214032 100644
--- a/trove/db/sqlalchemy/migrate_repo/versions/013_add_security_group_artifacts.py
+++ b/trove/db/sqlalchemy/migrate_repo/versions/013_add_security_group_artifacts.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/db/sqlalchemy/migration.py b/trove/db/sqlalchemy/migration.py
index 6a8fa7f9..06887581 100644
--- a/trove/db/sqlalchemy/migration.py
+++ b/trove/db/sqlalchemy/migration.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/db/sqlalchemy/session.py b/trove/db/sqlalchemy/session.py
index 7bf73756..24b30c6a 100644
--- a/trove/db/sqlalchemy/session.py
+++ b/trove/db/sqlalchemy/session.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/dns/driver.py b/trove/dns/driver.py
index f8569a52..4b42b31a 100644
--- a/trove/dns/driver.py
+++ b/trove/dns/driver.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/dns/manager.py b/trove/dns/manager.py
index 64a6d9f1..bf632e40 100644
--- a/trove/dns/manager.py
+++ b/trove/dns/manager.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/dns/models.py b/trove/dns/models.py
index 7c8db865..86562add 100644
--- a/trove/dns/models.py
+++ b/trove/dns/models.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/dns/rsdns/driver.py b/trove/dns/rsdns/driver.py
index e05f43bb..b444062f 100644
--- a/trove/dns/rsdns/driver.py
+++ b/trove/dns/rsdns/driver.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/extensions/account/models.py b/trove/extensions/account/models.py
index d1e413a3..1682939d 100644
--- a/trove/extensions/account/models.py
+++ b/trove/extensions/account/models.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/extensions/mgmt/host/instance/service.py b/trove/extensions/mgmt/host/instance/service.py
index 90e57e13..8e34fafc 100644
--- a/trove/extensions/mgmt/host/instance/service.py
+++ b/trove/extensions/mgmt/host/instance/service.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/extensions/mgmt/host/models.py b/trove/extensions/mgmt/host/models.py
index 6d76fd56..afa79028 100644
--- a/trove/extensions/mgmt/host/models.py
+++ b/trove/extensions/mgmt/host/models.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/extensions/mgmt/host/service.py b/trove/extensions/mgmt/host/service.py
index 91fc4e1c..54022efe 100644
--- a/trove/extensions/mgmt/host/service.py
+++ b/trove/extensions/mgmt/host/service.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/extensions/mgmt/host/views.py b/trove/extensions/mgmt/host/views.py
index 01e20bdb..0c356809 100644
--- a/trove/extensions/mgmt/host/views.py
+++ b/trove/extensions/mgmt/host/views.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/extensions/mgmt/instances/service.py b/trove/extensions/mgmt/instances/service.py
index 9b84663e..9cf022b4 100644
--- a/trove/extensions/mgmt/instances/service.py
+++ b/trove/extensions/mgmt/instances/service.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/extensions/mgmt/instances/views.py b/trove/extensions/mgmt/instances/views.py
index c32b28b3..54a3e640 100644
--- a/trove/extensions/mgmt/instances/views.py
+++ b/trove/extensions/mgmt/instances/views.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/extensions/mgmt/quota/service.py b/trove/extensions/mgmt/quota/service.py
index 28c6e31b..b18c5d29 100644
--- a/trove/extensions/mgmt/quota/service.py
+++ b/trove/extensions/mgmt/quota/service.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/extensions/mgmt/quota/views.py b/trove/extensions/mgmt/quota/views.py
index c7c8b033..e7231063 100644
--- a/trove/extensions/mgmt/quota/views.py
+++ b/trove/extensions/mgmt/quota/views.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/extensions/mgmt/volume/models.py b/trove/extensions/mgmt/volume/models.py
index 84ee4b3a..9650d48c 100644
--- a/trove/extensions/mgmt/volume/models.py
+++ b/trove/extensions/mgmt/volume/models.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/extensions/mgmt/volume/service.py b/trove/extensions/mgmt/volume/service.py
index 4ed05cfb..e8b589be 100644
--- a/trove/extensions/mgmt/volume/service.py
+++ b/trove/extensions/mgmt/volume/service.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/extensions/mgmt/volume/views.py b/trove/extensions/mgmt/volume/views.py
index 064dae69..c8bd3032 100644
--- a/trove/extensions/mgmt/volume/views.py
+++ b/trove/extensions/mgmt/volume/views.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/extensions/mysql/models.py b/trove/extensions/mysql/models.py
index 9a222ba3..f47e37cc 100644
--- a/trove/extensions/mysql/models.py
+++ b/trove/extensions/mysql/models.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/extensions/mysql/service.py b/trove/extensions/mysql/service.py
index e61fecb9..272ddb5e 100644
--- a/trove/extensions/mysql/service.py
+++ b/trove/extensions/mysql/service.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/extensions/mysql/views.py b/trove/extensions/mysql/views.py
index 7ebdc4e6..9e0af154 100644
--- a/trove/extensions/mysql/views.py
+++ b/trove/extensions/mysql/views.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/extensions/routes/mgmt.py b/trove/extensions/routes/mgmt.py
index f46b9ec2..f61870ae 100644
--- a/trove/extensions/routes/mgmt.py
+++ b/trove/extensions/routes/mgmt.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/extensions/routes/mysql.py b/trove/extensions/routes/mysql.py
index a40daefd..6f0e0b83 100644
--- a/trove/extensions/routes/mysql.py
+++ b/trove/extensions/routes/mysql.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/extensions/routes/security_group.py b/trove/extensions/routes/security_group.py
index c943bbc8..8a619843 100644
--- a/trove/extensions/routes/security_group.py
+++ b/trove/extensions/routes/security_group.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Hewlett-Packard Development Company, L.P.
 # All Rights Reserved.
 #
diff --git a/trove/extensions/security_group/models.py b/trove/extensions/security_group/models.py
index 839f2f16..c10076bc 100644
--- a/trove/extensions/security_group/models.py
+++ b/trove/extensions/security_group/models.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Hewlett-Packard Development Company, L.P.
 # All Rights Reserved.
 #
diff --git a/trove/extensions/security_group/service.py b/trove/extensions/security_group/service.py
index 6655f663..16dfe40d 100644
--- a/trove/extensions/security_group/service.py
+++ b/trove/extensions/security_group/service.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Hewlett-Packard Development Company, L.P.
 # All Rights Reserved.
 #
diff --git a/trove/extensions/security_group/views.py b/trove/extensions/security_group/views.py
index 45cbd476..6a2b8230 100644
--- a/trove/extensions/security_group/views.py
+++ b/trove/extensions/security_group/views.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Hewlett-Packard Development Company, L.P.
 # All Rights Reserved.
 #
diff --git a/trove/flavor/models.py b/trove/flavor/models.py
index e5cab6c8..2ea0802c 100644
--- a/trove/flavor/models.py
+++ b/trove/flavor/models.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/flavor/service.py b/trove/flavor/service.py
index 5ed4d85a..f3c4b0e8 100644
--- a/trove/flavor/service.py
+++ b/trove/flavor/service.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/flavor/views.py b/trove/flavor/views.py
index 3cabaa1a..43265a8f 100644
--- a/trove/flavor/views.py
+++ b/trove/flavor/views.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/guestagent/api.py b/trove/guestagent/api.py
index 285e98e2..700062c8 100644
--- a/trove/guestagent/api.py
+++ b/trove/guestagent/api.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/guestagent/common/operating_system.py b/trove/guestagent/common/operating_system.py
index 3b444b7c..a24f8593 100644
--- a/trove/guestagent/common/operating_system.py
+++ b/trove/guestagent/common/operating_system.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/guestagent/common/sql_query.py b/trove/guestagent/common/sql_query.py
index ad2d9489..66e1833a 100644
--- a/trove/guestagent/common/sql_query.py
+++ b/trove/guestagent/common/sql_query.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/guestagent/datastore/service.py b/trove/guestagent/datastore/service.py
index 76bb1e36..81dae9a7 100644
--- a/trove/guestagent/datastore/service.py
+++ b/trove/guestagent/datastore/service.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/guestagent/db/models.py b/trove/guestagent/db/models.py
index 766b53fb..5281676a 100644
--- a/trove/guestagent/db/models.py
+++ b/trove/guestagent/db/models.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/guestagent/dbaas.py b/trove/guestagent/dbaas.py
index 646c0155..4c55df29 100644
--- a/trove/guestagent/dbaas.py
+++ b/trove/guestagent/dbaas.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/guestagent/pkg.py b/trove/guestagent/pkg.py
index d676ea84..080a7487 100644
--- a/trove/guestagent/pkg.py
+++ b/trove/guestagent/pkg.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/guestagent/service.py b/trove/guestagent/service.py
index 48d88ea0..ac2a1bfc 100644
--- a/trove/guestagent/service.py
+++ b/trove/guestagent/service.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/guestagent/volume.py b/trove/guestagent/volume.py
index 9c65c131..b5487b7c 100644
--- a/trove/guestagent/volume.py
+++ b/trove/guestagent/volume.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/instance/models.py b/trove/instance/models.py
index 92a19e75..9842d96a 100644
--- a/trove/instance/models.py
+++ b/trove/instance/models.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #    Copyright 2010-2011 OpenStack Foundation
 #    Copyright 2013-2014 Rackspace Hosting
 #    All Rights Reserved.
diff --git a/trove/instance/service.py b/trove/instance/service.py
index 5d0575e4..f7e01fa1 100644
--- a/trove/instance/service.py
+++ b/trove/instance/service.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/instance/views.py b/trove/instance/views.py
index 70cc068a..4dc39046 100644
--- a/trove/instance/views.py
+++ b/trove/instance/views.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/limits/service.py b/trove/limits/service.py
index 1918aba4..354cdea5 100644
--- a/trove/limits/service.py
+++ b/trove/limits/service.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # Copyright 2013 Hewlett-Packard Development Company, L.P.
 #
diff --git a/trove/limits/views.py b/trove/limits/views.py
index 294a43d5..da599f05 100644
--- a/trove/limits/views.py
+++ b/trove/limits/views.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/openstack/__init__.py b/trove/openstack/__init__.py
index 4dec227c..31285c4f 100644
--- a/trove/openstack/__init__.py
+++ b/trove/openstack/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/quota/quota.py b/trove/quota/quota.py
index abf42646..4bf73443 100644
--- a/trove/quota/quota.py
+++ b/trove/quota/quota.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/taskmanager/manager.py b/trove/taskmanager/manager.py
index 78cca4d9..9c3b6453 100644
--- a/trove/taskmanager/manager.py
+++ b/trove/taskmanager/manager.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/taskmanager/service.py b/trove/taskmanager/service.py
index f0ccb27a..d3651783 100644
--- a/trove/taskmanager/service.py
+++ b/trove/taskmanager/service.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/tests/fakes/__init__.py b/trove/tests/fakes/__init__.py
index aca7f89f..14e24615 100644
--- a/trove/tests/fakes/__init__.py
+++ b/trove/tests/fakes/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/tests/fakes/common.py b/trove/tests/fakes/common.py
index dd5a31e3..be60d8f2 100644
--- a/trove/tests/fakes/common.py
+++ b/trove/tests/fakes/common.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/tests/fakes/guestagent.py b/trove/tests/fakes/guestagent.py
index be1ae13b..ce3bf3ef 100644
--- a/trove/tests/fakes/guestagent.py
+++ b/trove/tests/fakes/guestagent.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/tests/fakes/keystone.py b/trove/tests/fakes/keystone.py
index 06bc8fd9..e7db8480 100644
--- a/trove/tests/fakes/keystone.py
+++ b/trove/tests/fakes/keystone.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/tests/fakes/nova.py b/trove/tests/fakes/nova.py
index cce2ce2f..e82ec285 100644
--- a/trove/tests/fakes/nova.py
+++ b/trove/tests/fakes/nova.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/tests/unittests/api/test_versions.py b/trove/tests/unittests/api/test_versions.py
index 91cf2d91..ea588f09 100644
--- a/trove/tests/unittests/api/test_versions.py
+++ b/trove/tests/unittests/api/test_versions.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # Copyright 2013 Hewlett-Packard Development Company, L.P.
 #
diff --git a/trove/tests/unittests/guestagent/test_pkg.py b/trove/tests/unittests/guestagent/test_pkg.py
index a7a98d6b..384e9db6 100644
--- a/trove/tests/unittests/guestagent/test_pkg.py
+++ b/trove/tests/unittests/guestagent/test_pkg.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/tests/unittests/util/matchers.py b/trove/tests/unittests/util/matchers.py
index 12dde055..d00e8e94 100644
--- a/trove/tests/unittests/util/matchers.py
+++ b/trove/tests/unittests/util/matchers.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
 # Copyright 2012 Hewlett-Packard Development Company, L.P.
diff --git a/trove/tests/util/__init__.py b/trove/tests/util/__init__.py
index b0eb4d57..9042543f 100644
--- a/trove/tests/util/__init__.py
+++ b/trove/tests/util/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/tests/util/client.py b/trove/tests/util/client.py
index 3b8180ad..5d1eb345 100644
--- a/trove/tests/util/client.py
+++ b/trove/tests/util/client.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/tests/util/usage.py b/trove/tests/util/usage.py
index 4f585b54..868557dd 100644
--- a/trove/tests/util/usage.py
+++ b/trove/tests/util/usage.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 Rackspace Hosting
 # All Rights Reserved.
 #
diff --git a/trove/version.py b/trove/version.py
index 62905c28..33656d8f 100644
--- a/trove/version.py
+++ b/trove/version.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/trove/versions.py b/trove/versions.py
index 01779eec..4f8ac8b4 100644
--- a/trove/versions.py
+++ b/trove/versions.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #