From 747189c07e5536151de3e656bc8fa5d23d8baf3c Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr@redhat.com>
Date: Wed, 26 Mar 2014 13:07:13 +0000
Subject: [PATCH 43/72] Add vim tags to all python source files

Fixes Issue #243.

Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
---
 __run__.py                          | 2 ++
 example_plugins/example.py          | 2 ++
 setup.py                            | 2 ++
 sos/__init__.py                     | 2 ++
 sos/archive.py                      | 2 ++
 sos/plugins/__init__.py             | 2 ++
 sos/plugins/abrt.py                 | 2 ++
 sos/plugins/acpid.py                | 2 ++
 sos/plugins/anaconda.py             | 2 ++
 sos/plugins/anacron.py              | 2 ++
 sos/plugins/apache.py               | 2 ++
 sos/plugins/apparmor.py             | 2 ++
 sos/plugins/apport.py               | 2 ++
 sos/plugins/apt.py                  | 2 ++
 sos/plugins/ata.py                  | 2 ++
 sos/plugins/auditd.py               | 2 ++
 sos/plugins/autofs.py               | 2 ++
 sos/plugins/azure.py                | 2 ++
 sos/plugins/block.py                | 2 ++
 sos/plugins/boot.py                 | 2 ++
 sos/plugins/ceph.py                 | 2 ++
 sos/plugins/cgroups.py              | 2 ++
 sos/plugins/cluster.py              | 2 ++
 sos/plugins/cobbler.py              | 2 ++
 sos/plugins/corosync.py             | 2 ++
 sos/plugins/cron.py                 | 2 ++
 sos/plugins/cs.py                   | 2 ++
 sos/plugins/cups.py                 | 2 ++
 sos/plugins/devicemapper.py         | 2 ++
 sos/plugins/dhcp.py                 | 2 ++
 sos/plugins/distupgrade.py          | 2 ++
 sos/plugins/dmraid.py               | 2 ++
 sos/plugins/dovecot.py              | 2 ++
 sos/plugins/dpkg.py                 | 2 ++
 sos/plugins/ds.py                   | 2 ++
 sos/plugins/emc.py                  | 2 ++
 sos/plugins/filesys.py              | 2 ++
 sos/plugins/foreman.py              | 2 ++
 sos/plugins/gdm.py                  | 2 ++
 sos/plugins/general.py              | 2 ++
 sos/plugins/gluster.py              | 2 ++
 sos/plugins/grub.py                 | 2 ++
 sos/plugins/grub2.py                | 2 ++
 sos/plugins/hardware.py             | 2 ++
 sos/plugins/hts.py                  | 2 ++
 sos/plugins/i18n.py                 | 2 ++
 sos/plugins/infiniband.py           | 2 ++
 sos/plugins/ipa.py                  | 2 ++
 sos/plugins/ipsec.py                | 2 ++
 sos/plugins/iscsi.py                | 2 ++
 sos/plugins/iscsitarget.py          | 2 ++
 sos/plugins/java.py                 | 2 ++
 sos/plugins/juju.py                 | 2 ++
 sos/plugins/katello.py              | 2 ++
 sos/plugins/kdump.py                | 2 ++
 sos/plugins/kernel.py               | 2 ++
 sos/plugins/kernelrt.py             | 2 ++
 sos/plugins/krb5.py                 | 2 ++
 sos/plugins/kvm.py                  | 2 ++
 sos/plugins/landscape.py            | 2 ++
 sos/plugins/ldap.py                 | 2 ++
 sos/plugins/libraries.py            | 2 ++
 sos/plugins/libvirt.py              | 2 ++
 sos/plugins/lilo.py                 | 2 ++
 sos/plugins/logrotate.py            | 2 ++
 sos/plugins/logs.py                 | 2 ++
 sos/plugins/lsbrelease.py           | 2 ++
 sos/plugins/lvm2.py                 | 2 ++
 sos/plugins/maas.py                 | 2 ++
 sos/plugins/md.py                   | 2 ++
 sos/plugins/memory.py               | 2 ++
 sos/plugins/mrggrid.py              | 2 ++
 sos/plugins/mrgmessg.py             | 2 ++
 sos/plugins/multipath.py            | 2 ++
 sos/plugins/mysql.py                | 2 ++
 sos/plugins/named.py                | 2 ++
 sos/plugins/networking.py           | 2 ++
 sos/plugins/neutron.py              | 2 ++
 sos/plugins/nfs.py                  | 2 ++
 sos/plugins/nfsserver.py            | 2 ++
 sos/plugins/nis.py                  | 2 ++
 sos/plugins/nscd.py                 | 2 ++
 sos/plugins/ntp.py                  | 2 ++
 sos/plugins/oddjob.py               | 2 ++
 sos/plugins/openhpi.py              | 2 ++
 sos/plugins/openshift.py            | 2 ++
 sos/plugins/openssl.py              | 2 ++
 sos/plugins/openstack_ceilometer.py | 2 ++
 sos/plugins/openstack_cinder.py     | 2 ++
 sos/plugins/openstack_glance.py     | 2 ++
 sos/plugins/openstack_heat.py       | 2 ++
 sos/plugins/openstack_horizon.py    | 2 ++
 sos/plugins/openstack_keystone.py   | 2 ++
 sos/plugins/openstack_neutron.py    | 2 ++
 sos/plugins/openstack_nova.py       | 2 ++
 sos/plugins/openstack_swift.py      | 2 ++
 sos/plugins/openswan.py             | 2 ++
 sos/plugins/pam.py                  | 2 ++
 sos/plugins/pci.py                  | 2 ++
 sos/plugins/postfix.py              | 2 ++
 sos/plugins/postgresql.py           | 3 ++-
 sos/plugins/powerpc.py              | 2 ++
 sos/plugins/ppp.py                  | 2 ++
 sos/plugins/procenv.py              | 2 ++
 sos/plugins/process.py              | 2 ++
 sos/plugins/processor.py            | 2 ++
 sos/plugins/psacct.py               | 2 ++
 sos/plugins/pxe.py                  | 2 ++
 sos/plugins/qpid.py                 | 2 ++
 sos/plugins/quagga.py               | 2 ++
 sos/plugins/radius.py               | 2 ++
 sos/plugins/rhui.py                 | 2 ++
 sos/plugins/rpm.py                  | 2 ++
 sos/plugins/s390.py                 | 2 ++
 sos/plugins/samba.py                | 2 ++
 sos/plugins/sanlock.py              | 2 ++
 sos/plugins/sar.py                  | 2 ++
 sos/plugins/satellite.py            | 2 ++
 sos/plugins/scsi.py                 | 2 ++
 sos/plugins/selinux.py              | 2 ++
 sos/plugins/sendmail.py             | 2 ++
 sos/plugins/smartcard.py            | 2 ++
 sos/plugins/snmp.py                 | 2 ++
 sos/plugins/soundcard.py            | 2 ++
 sos/plugins/squid.py                | 2 ++
 sos/plugins/ssh.py                  | 2 ++
 sos/plugins/sssd.py                 | 2 ++
 sos/plugins/startup.py              | 2 ++
 sos/plugins/sunrpc.py               | 2 ++
 sos/plugins/system.py               | 2 ++
 sos/plugins/systemd.py              | 2 ++
 sos/plugins/systemtap.py            | 2 ++
 sos/plugins/sysvipc.py              | 2 ++
 sos/plugins/tftpserver.py           | 2 ++
 sos/plugins/tomcat.py               | 2 ++
 sos/plugins/tuned.py                | 2 ++
 sos/plugins/udev.py                 | 2 ++
 sos/plugins/upstart.py              | 2 ++
 sos/plugins/usb.py                  | 2 ++
 sos/plugins/veritas.py              | 2 ++
 sos/plugins/vmware.py               | 2 ++
 sos/plugins/vsftpd.py               | 2 ++
 sos/plugins/x11.py                  | 2 ++
 sos/plugins/xen.py                  | 2 ++
 sos/plugins/xfs.py                  | 2 ++
 sos/plugins/xinetd.py               | 2 ++
 sos/plugins/yum.py                  | 2 ++
 sos/policies/__init__.py            | 2 ++
 sos/policies/debian.py              | 2 ++
 sos/policies/osx.py                 | 2 ++
 sos/policies/redhat.py              | 3 ++-
 sos/policies/ubuntu.py              | 2 ++
 sos/policies/windows.py             | 2 ++
 sos/reporting.py                    | 2 ++
 sos/sosreport.py                    | 2 ++
 sos/utilities.py                    | 2 ++
 tests/archive_tests.py              | 2 ++
 tests/importer_tests.py             | 2 ++
 tests/option_tests.py               | 2 ++
 tests/plugin_tests.py               | 2 ++
 tests/policy_tests.py               | 2 ++
 tests/report_tests.py               | 2 ++
 tests/sosreport_pexpect.py          | 2 ++
 tests/test_exe.py                   | 2 ++
 tests/utilities_tests.py            | 2 ++
 165 files changed, 330 insertions(+), 2 deletions(-)

diff --git a/__run__.py b/__run__.py
index 663ee14..0f46807 100755
--- a/__run__.py
+++ b/__run__.py
@@ -15,3 +15,5 @@ from sos.sosreport import main
 import sys
 
 main(sys.argv[1:])
+
+# vim: et ts=4 sw=4
diff --git a/example_plugins/example.py b/example_plugins/example.py
index e13d92b..31e8c78 100755
--- a/example_plugins/example.py
+++ b/example_plugins/example.py
@@ -55,3 +55,5 @@ class example(Plugin, RedHatPlugin):
         # Here's how to execute a command
         self.collectExtOutput("/bin/ps -ef")
 
+
+# vim: et ts=4 sw=4
diff --git a/setup.py b/setup.py
index 0ae87b3..09d164f 100644
--- a/setup.py
+++ b/setup.py
@@ -70,3 +70,5 @@ setup(name='sosreport',
       requires=['six'],
      )
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/__init__.py b/sos/__init__.py
index f2b8e32..fc6738b 100644
--- a/sos/__init__.py
+++ b/sos/__init__.py
@@ -32,3 +32,5 @@ def _default(msg):
     return gettext.dgettext(gettext_app, msg)
 
 _sos = _default
+
+# vim: et ts=4 sw=4
diff --git a/sos/archive.py b/sos/archive.py
index 9e6029b..3cca9b7 100644
--- a/sos/archive.py
+++ b/sos/archive.py
@@ -332,3 +332,5 @@ class ZipFileArchive(Archive):
 
     def close(self):
         self.zipfile.close()
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py
index d420cd0..9ee0b61 100644
--- a/sos/plugins/__init__.py
+++ b/sos/plugins/__init__.py
@@ -700,3 +700,5 @@ def import_plugin(name, superclasses=None):
     if not superclasses:
         superclasses = (Plugin,)
     return import_module(plugin_fqname, superclasses)
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/abrt.py b/sos/plugins/abrt.py
index 148d57a..660c0f7 100644
--- a/sos/plugins/abrt.py
+++ b/sos/plugins/abrt.py
@@ -44,3 +44,5 @@ class Abrt(Plugin, RedHatPlugin):
             self.do_backtraces()
 
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/acpid.py b/sos/plugins/acpid.py
index 9a2d123..b9371f0 100644
--- a/sos/plugins/acpid.py
+++ b/sos/plugins/acpid.py
@@ -31,3 +31,5 @@ class DebianAcpid(Acpid, DebianPlugin, UbuntuPlugin):
     def setup(self):
         self.add_copy_specs([
             "/etc/acpi/events/powerbtn*"])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/anaconda.py b/sos/plugins/anaconda.py
index dcec704..e165ba7 100644
--- a/sos/plugins/anaconda.py
+++ b/sos/plugins/anaconda.py
@@ -44,3 +44,5 @@ class Anaconda(Plugin, RedHatPlugin):
         self.do_file_sub("/root/anaconda-ks.cfg",
                         r"(\s*rootpw\s*).*",
                         r"\1******")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/anacron.py b/sos/plugins/anacron.py
index e9595a8..60efa27 100644
--- a/sos/plugins/anacron.py
+++ b/sos/plugins/anacron.py
@@ -27,3 +27,5 @@ class Anacron(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
 
     def setup(self):
         self.add_copy_specs(list(self.files))
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/apache.py b/sos/plugins/apache.py
index d889125..bad943b 100644
--- a/sos/plugins/apache.py
+++ b/sos/plugins/apache.py
@@ -50,3 +50,5 @@ class DebianApache(Apache, DebianPlugin, UbuntuPlugin):
             "/etc/default/apache2"])
         if self.get_option("log"):
             self.add_copy_spec("/var/log/apache2/*")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/apparmor.py b/sos/plugins/apparmor.py
index afdad18..76ca9db 100644
--- a/sos/plugins/apparmor.py
+++ b/sos/plugins/apparmor.py
@@ -25,3 +25,5 @@ class Apparmor(Plugin, UbuntuPlugin):
         self.add_copy_specs([
             "/etc/apparmor"
         ])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/apport.py b/sos/plugins/apport.py
index e3a02ef..b7f884f 100644
--- a/sos/plugins/apport.py
+++ b/sos/plugins/apport.py
@@ -23,3 +23,5 @@ class Apport(Plugin, DebianPlugin, UbuntuPlugin):
 
     def setup(self):
         self.add_copy_spec("/etc/apport/*")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/apt.py b/sos/plugins/apt.py
index ad2fe1a..8aea629 100644
--- a/sos/plugins/apt.py
+++ b/sos/plugins/apt.py
@@ -29,3 +29,5 @@ class Apt(Plugin, DebianPlugin, UbuntuPlugin):
         self.add_cmd_output("apt-config dump")
         self.add_cmd_output("apt-cache stats")
         self.add_cmd_output("apt-cache policy")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/ata.py b/sos/plugins/ata.py
index eb0f53f..f947455 100644
--- a/sos/plugins/ata.py
+++ b/sos/plugins/ata.py
@@ -34,3 +34,5 @@ class Ata(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
                     self.add_cmd_output("hdparm %s" % disk_path)
                     self.add_cmd_output("smartctl -a %s" % disk_path)
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/auditd.py b/sos/plugins/auditd.py
index c031e14..1f51306 100644
--- a/sos/plugins/auditd.py
+++ b/sos/plugins/auditd.py
@@ -28,3 +28,5 @@ class Auditd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
                             "/etc/audit/audit.rules"])
         self.add_copy_spec_limit("/var/log/audit*",
                 sizelimit = self.get_option("logsize"))
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/autofs.py b/sos/plugins/autofs.py
index b1d264b..a4dbfea 100644
--- a/sos/plugins/autofs.py
+++ b/sos/plugins/autofs.py
@@ -65,3 +65,5 @@ class DebianAutofs(Autofs, DebianPlugin, UbuntuPlugin):
     def setup(self):
         super(DebianAutofs, self).setup()
         self.add_cmd_output("dpkg-query -s autofs")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/azure.py b/sos/plugins/azure.py
index 65ba9ac..6f16c75 100644
--- a/sos/plugins/azure.py
+++ b/sos/plugins/azure.py
@@ -29,3 +29,5 @@ class Azure(Plugin, UbuntuPlugin):
                            "/etc/default/kv-kvp-daemon-init",
                            "/sys/module/hv_netvsc/parameters/ring_size",
                            "/sys/module/hv_storvsc/parameters/storvsc_ringbuffer_size"])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/block.py b/sos/plugins/block.py
index 044345b..de0de81 100644
--- a/sos/plugins/block.py
+++ b/sos/plugins/block.py
@@ -41,3 +41,5 @@ class Block(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
                 self.add_cmd_output("udevadm info -ap /sys/block/%s" % (disk))
                 self.add_cmd_output("parted -s %s print" % (disk_path))
                 self.add_cmd_output("fdisk -l %s" % disk_path)
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/boot.py b/sos/plugins/boot.py
index bf50120..22ca155 100644
--- a/sos/plugins/boot.py
+++ b/sos/plugins/boot.py
@@ -42,3 +42,5 @@ class Boot(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
                     continue
                 self.add_cmd_output("lsinitrd %s" % image)
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/ceph.py b/sos/plugins/ceph.py
index decd161..b408f8f 100644
--- a/sos/plugins/ceph.py
+++ b/sos/plugins/ceph.py
@@ -42,3 +42,5 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin):
         self.add_forbidden_path("/etc/ceph/*keyring")
         self.add_forbidden_path("/var/lib/ceph/*/*keyring")
         self.add_forbidden_path("/var/lib/ceph/*keyring")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/cgroups.py b/sos/plugins/cgroups.py
index 102b71c..6f34e64 100644
--- a/sos/plugins/cgroups.py
+++ b/sos/plugins/cgroups.py
@@ -40,3 +40,5 @@ class RedHatCgroups(Cgroups, RedHatPlugin):
                            "/etc/cgconfig.conf",
                            "/etc/cgrules.conf"])
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/cluster.py b/sos/plugins/cluster.py
index 0b839fa..f4ed405 100644
--- a/sos/plugins/cluster.py
+++ b/sos/plugins/cluster.py
@@ -126,3 +126,5 @@ class Cluster(Plugin, RedHatPlugin):
                         r"(.*fence.*\.passwd=)(.*)",
                         r"\1******")
         return
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/cobbler.py b/sos/plugins/cobbler.py
index b754813..061e2a6 100644
--- a/sos/plugins/cobbler.py
+++ b/sos/plugins/cobbler.py
@@ -40,3 +40,5 @@ class DebianCobbler(Cobbler, DebianPlugin, UbuntuPlugin):
         self.add_copy_spec("/var/log/cobbler")
         self.add_copy_spec("/var/lib/cobbler")
         self.add_forbidden_path("/var/lib/cobbler/isos")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/corosync.py b/sos/plugins/corosync.py
index 79333c2..e91a9d4 100644
--- a/sos/plugins/corosync.py
+++ b/sos/plugins/corosync.py
@@ -51,3 +51,5 @@ class DebianCorosync(Corosync, DebianPlugin, UbuntuPlugin):
         super(DebianCorosync, self).setup()
 
     files = ('/usr/sbin/corosync',)
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/cron.py b/sos/plugins/cron.py
index f0f4856..ae2b479 100644
--- a/sos/plugins/cron.py
+++ b/sos/plugins/cron.py
@@ -30,3 +30,5 @@ class Cron(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         ])
         self.add_cmd_output("crontab -l -u root",
                 suggest_filename = "root_crontab")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/cs.py b/sos/plugins/cs.py
index 3adf1f6..7ae79d3 100644
--- a/sos/plugins/cs.py
+++ b/sos/plugins/cs.py
@@ -87,3 +87,5 @@ class CertificateSystem(Plugin, RedHatPlugin):
                 "/var/log/pki-*/ra-debug.log",
                 "/var/log/pki-*/transactions",
                 "/var/log/pki-*/system"])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/cups.py b/sos/plugins/cups.py
index aaa3971..17ca3cc 100644
--- a/sos/plugins/cups.py
+++ b/sos/plugins/cups.py
@@ -34,3 +34,5 @@ class Printing(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         self.add_cmd_output("lpstat -t")
         self.add_cmd_output("lpstat -s")
         self.add_cmd_output("lpstat -d")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/devicemapper.py b/sos/plugins/devicemapper.py
index 9e553c2..cc10268 100644
--- a/sos/plugins/devicemapper.py
+++ b/sos/plugins/devicemapper.py
@@ -27,3 +27,5 @@ class DeviceMapper(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         self.add_cmd_output("dmsetup status")
         self.add_cmd_output("dmsetup ls --tree")
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/dhcp.py b/sos/plugins/dhcp.py
index 71946c2..344e1e3 100644
--- a/sos/plugins/dhcp.py
+++ b/sos/plugins/dhcp.py
@@ -44,3 +44,5 @@ class UbuntuDhcp(Dhcp, UbuntuPlugin):
             "/etc/default/udhcpd",
             "/etc/udhcpd.conf"
         ])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/distupgrade.py b/sos/plugins/distupgrade.py
index b45d099..d618dfc 100644
--- a/sos/plugins/distupgrade.py
+++ b/sos/plugins/distupgrade.py
@@ -37,3 +37,5 @@ class RedHatDistUpgrade(DistUpgrade, RedHatPlugin):
     )
 
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/dmraid.py b/sos/plugins/dmraid.py
index 12242bf..12613b5 100644
--- a/sos/plugins/dmraid.py
+++ b/sos/plugins/dmraid.py
@@ -25,3 +25,5 @@ class Dmraid(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     def setup(self):
         for opt in self.dmraid_options:
             self.add_cmd_output("dmraid -%s" % (opt,))
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/dovecot.py b/sos/plugins/dovecot.py
index 2d92a6b..37e504b 100644
--- a/sos/plugins/dovecot.py
+++ b/sos/plugins/dovecot.py
@@ -41,3 +41,5 @@ class DebianDovecot(Dovecot, DebianPlugin, UbuntuPlugin):
         super(DebianDovecot, self).setup()
 
     files = ('/etc/dovecot/README',)
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/dpkg.py b/sos/plugins/dpkg.py
index 1912e34..266b2ee 100644
--- a/sos/plugins/dpkg.py
+++ b/sos/plugins/dpkg.py
@@ -24,3 +24,5 @@ class Dpkg(Plugin, DebianPlugin, UbuntuPlugin):
     def setup(self):
         self.add_copy_spec("/var/log/dpkg.log")
         self.add_cmd_output("dpkg -l", root_symlink = "installed-debs")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/ds.py b/sos/plugins/ds.py
index 1bbcd64..7092701 100644
--- a/sos/plugins/ds.py
+++ b/sos/plugins/ds.py
@@ -46,3 +46,5 @@ class DirectoryServer(Plugin, RedHatPlugin):
             self.add_copy_specs([
                 "/opt/redhat-ds/slapd-*/config",
                 "/opt/redhat-ds/slapd-*/logs"])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/emc.py b/sos/plugins/emc.py
index 5a2495e..d5fb1ed 100644
--- a/sos/plugins/emc.py
+++ b/sos/plugins/emc.py
@@ -219,3 +219,5 @@ class Emc(Plugin, RedHatPlugin):
         ## Only provide About EMC if EMC products are installed
         if add_about_emc != "no":
             self.about_emc()
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/filesys.py b/sos/plugins/filesys.py
index 7564ddf..9deb75d 100644
--- a/sos/plugins/filesys.py
+++ b/sos/plugins/filesys.py
@@ -48,3 +48,5 @@ class Filesys(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             ext_fs_regex = r"^(/dev/.+).+ext[234]\s+"
             for dev in zip(self.do_regex_find_all(ext_fs_regex, mounts)):
                 self.add_cmd_output("dumpe2fs -h %s" % (dev))
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/foreman.py b/sos/plugins/foreman.py
index a2f2881..661c075 100644
--- a/sos/plugins/foreman.py
+++ b/sos/plugins/foreman.py
@@ -27,3 +27,5 @@ class Foreman(Plugin, RedHatPlugin):
     def setup(self):
         self.add_cmd_output("%s -q -a -d %s" % ("foreman-debug",
                            self.get_cmd_output_path(name="foreman-debug")))
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/gdm.py b/sos/plugins/gdm.py
index 05601f3..3863813 100644
--- a/sos/plugins/gdm.py
+++ b/sos/plugins/gdm.py
@@ -22,3 +22,5 @@ class Gdm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
 
     def setup(self):
         self.add_copy_spec("/etc/gdm/*")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/general.py b/sos/plugins/general.py
index a6964c4..0906de1 100644
--- a/sos/plugins/general.py
+++ b/sos/plugins/general.py
@@ -78,3 +78,5 @@ class UbuntuGeneral(DebianGeneral):
     def setup(self):
         super(UbuntuGeneral, self).setup()
         self.add_copy_spec("/etc/os-release")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/gluster.py b/sos/plugins/gluster.py
index 4286b59..d9c35d3 100644
--- a/sos/plugins/gluster.py
+++ b/sos/plugins/gluster.py
@@ -113,3 +113,5 @@ class Gluster(Plugin, RedHatPlugin):
         # collect this last as some of the other actions create log entries
         self.add_copy_spec("/var/log/glusterfs")
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/grub.py b/sos/plugins/grub.py
index bdda115..cc4d593 100644
--- a/sos/plugins/grub.py
+++ b/sos/plugins/grub.py
@@ -29,3 +29,5 @@ class Grub(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "/etc/grub.d"
         ])
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/grub2.py b/sos/plugins/grub2.py
index fd86211..c9f64b0 100644
--- a/sos/plugins/grub2.py
+++ b/sos/plugins/grub2.py
@@ -32,3 +32,5 @@ class Grub2(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         ])
         self.add_cmd_output("ls -lanR /boot")
         self.add_cmd_output("grub2-mkconfig")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/hardware.py b/sos/plugins/hardware.py
index eda0060..f3c968e 100644
--- a/sos/plugins/hardware.py
+++ b/sos/plugins/hardware.py
@@ -53,3 +53,5 @@ class DebianHardware(Hardware, DebianPlugin, UbuntuPlugin):
 
     def setup(self):
         super(DebianHardware, self).setup()
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/hts.py b/sos/plugins/hts.py
index d514bf8..2200793 100644
--- a/sos/plugins/hts.py
+++ b/sos/plugins/hts.py
@@ -23,3 +23,5 @@ class HardwareTestSuite(Plugin, RedHatPlugin):
     def setup(self):
         self.add_copy_spec("/etc/httpd/conf.d/hts.conf")
         self.add_copy_spec("/var/hts")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/i18n.py b/sos/plugins/i18n.py
index 0361c55..dd2b36a 100644
--- a/sos/plugins/i18n.py
+++ b/sos/plugins/i18n.py
@@ -23,3 +23,5 @@ class I18n(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     def setup(self):
         self.add_copy_specs(["/etc/X11/xinit/xinput.d/*", "/etc/locale.conf"])
         self.add_cmd_output("locale")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/infiniband.py b/sos/plugins/infiniband.py
index e1288c9..2c890a5 100644
--- a/sos/plugins/infiniband.py
+++ b/sos/plugins/infiniband.py
@@ -39,3 +39,5 @@ class Infiniband(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         self.add_cmd_output("ibhosts")
 
         return
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/ipa.py b/sos/plugins/ipa.py
index 0061659..2812939 100644
--- a/sos/plugins/ipa.py
+++ b/sos/plugins/ipa.py
@@ -81,3 +81,5 @@ class Ipa(Plugin, RedHatPlugin):
         subst = r"\1********"
         self.do_file_sub("/etc/named.conf", match, subst)
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/ipsec.py b/sos/plugins/ipsec.py
index 1f00d51..b389432 100644
--- a/sos/plugins/ipsec.py
+++ b/sos/plugins/ipsec.py
@@ -42,3 +42,5 @@ class DebianIPSec(IPSec, DebianPlugin, UbuntuPlugin):
         self.add_copy_specs(["/etc/ipsec-tools.conf",
                            "/etc/ipsec-tools.d",
                            "/etc/default/setkey"])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/iscsi.py b/sos/plugins/iscsi.py
index 2a49ee4..3dbecf4 100644
--- a/sos/plugins/iscsi.py
+++ b/sos/plugins/iscsi.py
@@ -37,3 +37,5 @@ class RedHatIscsi(Iscsi, RedHatPlugin):
         self.add_cmd_output("iscsiadm -m node -P 3")
         self.add_cmd_output("iscsiadm -m iface -P 1")
         self.add_cmd_output("iscsiadm -m node --op=show")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/iscsitarget.py b/sos/plugins/iscsitarget.py
index a3a3e7e..d91c222 100644
--- a/sos/plugins/iscsitarget.py
+++ b/sos/plugins/iscsitarget.py
@@ -47,3 +47,5 @@ class DebianIscsiTarget(IscsiTarget, DebianPlugin, UbuntuPlugin):
             "/etc/sysctl.d/30-iscsitarget.conf",
             "/etc/default/iscsitarget"
             ])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/java.py b/sos/plugins/java.py
index bad726c..d316bc1 100644
--- a/sos/plugins/java.py
+++ b/sos/plugins/java.py
@@ -27,3 +27,5 @@ class Java(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
                                         root_symlink="java")
         self.add_cmd_output("readlink -f /usr/bin/java")
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/juju.py b/sos/plugins/juju.py
index c7bbdf1..ef2cdbf 100644
--- a/sos/plugins/juju.py
+++ b/sos/plugins/juju.py
@@ -28,3 +28,5 @@ class Juju(Plugin, UbuntuPlugin):
 
         self.add_cmd_output("juju -v status")
         self.add_cmd_output("juju -v get-constraints")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/katello.py b/sos/plugins/katello.py
index acf5d90..6fd0fb7 100644
--- a/sos/plugins/katello.py
+++ b/sos/plugins/katello.py
@@ -27,3 +27,5 @@ class Katello(Plugin, RedHatPlugin):
     def setup(self):
         self.add_cmd_output("katello-debug --notar -d %s"
                             % self.get_cmd_output_path(name="katello-debug"))
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/kdump.py b/sos/plugins/kdump.py
index 81ce574..460d69e 100644
--- a/sos/plugins/kdump.py
+++ b/sos/plugins/kdump.py
@@ -50,3 +50,5 @@ class DebianKDump(KDump, DebianPlugin, UbuntuPlugin):
         self.add_copy_specs([
             "/etc/default/kdump-tools"
         ])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/kernel.py b/sos/plugins/kernel.py
index f96fe6c..d40f549 100644
--- a/sos/plugins/kernel.py
+++ b/sos/plugins/kernel.py
@@ -66,3 +66,5 @@ class Kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         ])
 
         self.add_cmd_output("dkms status")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/kernelrt.py b/sos/plugins/kernelrt.py
index b5fdc5d..ad5c4e7 100644
--- a/sos/plugins/kernelrt.py
+++ b/sos/plugins/kernelrt.py
@@ -35,3 +35,5 @@ class KernelRT(Plugin, RedHatPlugin):
         self.add_copy_spec('/sys/devices/system/clocksource/clocksource0/current_clocksource')
         if self.is_installed('tuna'):
             self.add_cmd_output('tuna -CP | /usthead -20')
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/krb5.py b/sos/plugins/krb5.py
index 0d33094..78a8c6a 100644
--- a/sos/plugins/krb5.py
+++ b/sos/plugins/krb5.py
@@ -26,3 +26,5 @@ class Krb5(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         self.add_copy_spec("/etc/krb5.conf")
         self.add_cmd_output("klist -ket /etc/krb5.keytab")
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/kvm.py b/sos/plugins/kvm.py
index a0c44c1..51b8488 100644
--- a/sos/plugins/kvm.py
+++ b/sos/plugins/kvm.py
@@ -42,3 +42,5 @@ class Kvm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     def postproc(self):
         if self._debugfs_cleanup and os.path.ismount("/sys/kernel/debug"):
             os.popen("umount /sys/kernel/debug")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/landscape.py b/sos/plugins/landscape.py
index 4096039..699786f 100644
--- a/sos/plugins/landscape.py
+++ b/sos/plugins/landscape.py
@@ -71,3 +71,5 @@ class Landscape(Plugin, UbuntuPlugin):
         )
         
                                                     
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/ldap.py b/sos/plugins/ldap.py
index 79d8394..eb8e755 100644
--- a/sos/plugins/ldap.py
+++ b/sos/plugins/ldap.py
@@ -82,3 +82,5 @@ class DebianLdap(Ldap, DebianPlugin, UbuntuPlugin):
         self.do_cmd_output_sub(
         "ldapsearch -Q -LLL -Y EXTERNAL -H ldapi:/// -b cn=config '(!(objectClass=olcSchemaConfig))'",
             r"(olcRootPW\: \s*)\S+", r"\1********")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/libraries.py b/sos/plugins/libraries.py
index 1ab5f17..b6e6195 100644
--- a/sos/plugins/libraries.py
+++ b/sos/plugins/libraries.py
@@ -28,3 +28,5 @@ class Libraries(Plugin, RedHatPlugin, UbuntuPlugin):
         if self.get_option("ldconfigv"):
             self.add_cmd_output("ldconfig -v -N -X")
         self.add_cmd_output("ldconfig -p -N -X")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/libvirt.py b/sos/plugins/libvirt.py
index e525f1b..c031409 100644
--- a/sos/plugins/libvirt.py
+++ b/sos/plugins/libvirt.py
@@ -29,3 +29,5 @@ class Libvirt(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
             self.do_file_sub(xmlfile,
                     r"(\s*passwd=\s*')([^']*)('.*$)",
                     r"\1******\3")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/lilo.py b/sos/plugins/lilo.py
index 237cfc6..46c1814 100644
--- a/sos/plugins/lilo.py
+++ b/sos/plugins/lilo.py
@@ -24,3 +24,5 @@ class Lilo(Plugin, RedHatPlugin, UbuntuPlugin):
     def setup(self):
         self.add_copy_spec("/etc/lilo.conf")
         self.add_cmd_output("lilo -q")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/logrotate.py b/sos/plugins/logrotate.py
index c4b1fc5..1ab4410 100644
--- a/sos/plugins/logrotate.py
+++ b/sos/plugins/logrotate.py
@@ -26,3 +26,5 @@ class LogRotate(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         self.add_copy_specs([
             "/etc/logrotate*",
             "/var/lib/logrotate.status"])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/logs.py b/sos/plugins/logs.py
index 7e7545f..1cd767c 100644
--- a/sos/plugins/logs.py
+++ b/sos/plugins/logs.py
@@ -85,3 +85,5 @@ class UbuntuLogs(Logs, UbuntuPlugin):
             "/var/log/landscape",
         ])
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/lsbrelease.py b/sos/plugins/lsbrelease.py
index e364a17..7a8ceed 100644
--- a/sos/plugins/lsbrelease.py
+++ b/sos/plugins/lsbrelease.py
@@ -26,3 +26,5 @@ class LsbRelease(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         self.add_cmd_output("lsb_release -a")
         self.add_cmd_output("lsb_release -d", suggest_filename = "lsb_release", root_symlink = "lsb-release")
         self.add_copy_spec("/etc/lsb-release*")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/lvm2.py b/sos/plugins/lvm2.py
index 102df26..82f7255 100644
--- a/sos/plugins/lvm2.py
+++ b/sos/plugins/lvm2.py
@@ -53,3 +53,5 @@ class Lvm2(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             self.do_lvmdump(metadata=True)
 
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/maas.py b/sos/plugins/maas.py
index 4ed94d4..af0db3d 100644
--- a/sos/plugins/maas.py
+++ b/sos/plugins/maas.py
@@ -34,3 +34,5 @@ class Maas(Plugin, UbuntuPlugin):
         self.add_cmd_output("apt-cache policy maas-*")
         self.add_cmd_output("apt-cache policy python-django-*")
         self.add_cmd_output("maas dumpdata")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/md.py b/sos/plugins/md.py
index ecba0f7..2f9e8ef 100644
--- a/sos/plugins/md.py
+++ b/sos/plugins/md.py
@@ -29,3 +29,5 @@ class Md(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "/dev/md/md-device-map"
         ])
         
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/memory.py b/sos/plugins/memory.py
index 0b26a84..f2ec27c 100644
--- a/sos/plugins/memory.py
+++ b/sos/plugins/memory.py
@@ -32,3 +32,5 @@ class Memory(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
                             suggest_filename="dmesg.e820-map")
         self.add_cmd_output("free", root_symlink = "free")
         self.add_cmd_output("free -m")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/mrggrid.py b/sos/plugins/mrggrid.py
index a8e7e35..05fde9b 100644
--- a/sos/plugins/mrggrid.py
+++ b/sos/plugins/mrggrid.py
@@ -23,3 +23,5 @@ class MrgGrid(Plugin, RedHatPlugin):
     def setup(self):
         self.add_copy_spec("/etc/condor/condor_config")
         self.add_copy_spec("condor_status")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/mrgmessg.py b/sos/plugins/mrgmessg.py
index 4e85db6..f29ce74 100644
--- a/sos/plugins/mrgmessg.py
+++ b/sos/plugins/mrgmessg.py
@@ -25,3 +25,5 @@ class MrgMessg(Plugin, RedHatPlugin):
             "/etc/qpidd.conf",
             "/etc/sasl2/qpidd.conf",
             "/var/rhm"])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/multipath.py b/sos/plugins/multipath.py
index 7917352..0eceadf 100644
--- a/sos/plugins/multipath.py
+++ b/sos/plugins/multipath.py
@@ -30,3 +30,5 @@ class Multipath(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         self.add_cmd_output("multipath -v4 -ll")
 
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/mysql.py b/sos/plugins/mysql.py
index e3c971f..b168e13 100644
--- a/sos/plugins/mysql.py
+++ b/sos/plugins/mysql.py
@@ -50,3 +50,5 @@ class DebianMysql(Mysql, DebianPlugin, UbuntuPlugin):
         self.mysql_cnf = "/etc/mysql/my.cnf"
         super(DebianMysql, self).setup()
         self.add_copy_spec("/etc/mysql/conf.d/mysql*")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/named.py b/sos/plugins/named.py
index e73bf42..6c68091 100644
--- a/sos/plugins/named.py
+++ b/sos/plugins/named.py
@@ -84,3 +84,5 @@ class DebianNamed(Named, DebianPlugin, UbuntuPlugin):
         self.add_copy_spec("/etc/bind/")
         return
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py
index 598d375..ce5b3aa 100644
--- a/sos/plugins/networking.py
+++ b/sos/plugins/networking.py
@@ -153,3 +153,5 @@ class UbuntuNetworking(Networking, UbuntuPlugin):
         if self.get_option("traceroute"):
             self.add_cmd_output("/usr/sbin/traceroute -n %s" % self.trace_host)
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/neutron.py b/sos/plugins/neutron.py
index 2317433..2200606 100644
--- a/sos/plugins/neutron.py
+++ b/sos/plugins/neutron.py
@@ -176,3 +176,5 @@ class RedHatNeutron(Neutron, RedHatPlugin):
         super(RedHatNeutron, self).setup()
         self.packages = self.gen_pkg_tuple(self.package_list_template)
         self.add_copy_specs(["/etc/sudoers.d/%s-rootwrap" % self.component_name])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/nfs.py b/sos/plugins/nfs.py
index 2e00333..5b6ffa0 100644
--- a/sos/plugins/nfs.py
+++ b/sos/plugins/nfs.py
@@ -29,3 +29,5 @@ class Nfs(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         ])
         return
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/nfsserver.py b/sos/plugins/nfsserver.py
index 7ae704e..5ba8c4b 100644
--- a/sos/plugins/nfsserver.py
+++ b/sos/plugins/nfsserver.py
@@ -49,3 +49,5 @@ class NfsServer(Plugin, RedHatPlugin):
         self.add_cmd_output("rpcinfo -p localhost")
         self.add_cmd_output("nfsstat -o all")
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/nis.py b/sos/plugins/nis.py
index baa71e8..cec8aaa 100644
--- a/sos/plugins/nis.py
+++ b/sos/plugins/nis.py
@@ -30,3 +30,5 @@ class Nis(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         self.add_copy_spec("/etc/yp*.conf")
         self.add_copy_spec("/var/yp/*")
         self.add_cmd_output("domainname")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/nscd.py b/sos/plugins/nscd.py
index 91a31ef..339f52e 100644
--- a/sos/plugins/nscd.py
+++ b/sos/plugins/nscd.py
@@ -37,3 +37,5 @@ class Nscd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
                 f = o.split()
                 self.add_copy_spec_limit(f[1],
                     sizelimit = self.option_enabled("nscdlogsize"))
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/ntp.py b/sos/plugins/ntp.py
index 639b292..0fba6f2 100644
--- a/sos/plugins/ntp.py
+++ b/sos/plugins/ntp.py
@@ -49,3 +49,5 @@ class DebianNtp(Ntp, DebianPlugin, UbuntuPlugin):
         super(DebianNtp, self).setup()
         self.add_copy_spec('/etc/default/ntp')
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/oddjob.py b/sos/plugins/oddjob.py
index 473a691..ea168eb 100644
--- a/sos/plugins/oddjob.py
+++ b/sos/plugins/oddjob.py
@@ -29,3 +29,5 @@ class Oddjob(Plugin, RedHatPlugin):
         self.add_copy_spec("/etc/oddjobd.conf")
         self.add_copy_spec("/etc/oddjobd.conf.d")
         self.add_copy_spec("/etc/dbus-1/system.d/oddjob.conf")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/openhpi.py b/sos/plugins/openhpi.py
index dbe004d..80053ed 100644
--- a/sos/plugins/openhpi.py
+++ b/sos/plugins/openhpi.py
@@ -31,3 +31,5 @@ class OpenHPI(Plugin, RedHatPlugin):
         self.do_file_sub("/etc/openhpi/openhpi.conf",
                         r'(\s*[Pp]ass.*\s*=\s*).*', r'\1********')
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/openshift.py b/sos/plugins/openshift.py
index 459e75e..4eaf236 100644
--- a/sos/plugins/openshift.py
+++ b/sos/plugins/openshift.py
@@ -70,3 +70,5 @@ class Openshift(Plugin, RedHatPlugin):
 	    self.do_file_sub('/etc/openshift/htpasswd',
 			    r"(.*:)(.*)",
 			    r"\1********")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/openssl.py b/sos/plugins/openssl.py
index c73181b..261ad07 100644
--- a/sos/plugins/openssl.py
+++ b/sos/plugins/openssl.py
@@ -53,3 +53,5 @@ class DebianOpenSSL(OpenSSL, DebianPlugin, UbuntuPlugin):
     def setup(self):
         super(DebianOpenSSL, self).setup()
         self.add_copy_spec("/etc/ssl/openssl.cnf")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/openstack_ceilometer.py b/sos/plugins/openstack_ceilometer.py
index 524b68b..4b877d6 100644
--- a/sos/plugins/openstack_ceilometer.py
+++ b/sos/plugins/openstack_ceilometer.py
@@ -51,3 +51,5 @@ class RedHatOpenStackCeilometer(OpenStackCeilometer, plugins.RedHatPlugin):
                 'openstack-ceilometer-common',
                 'openstack-ceilometer-compute',
                 'python-ceilometerclient')
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/openstack_cinder.py b/sos/plugins/openstack_cinder.py
index 97eb8fb..41f99c4 100644
--- a/sos/plugins/openstack_cinder.py
+++ b/sos/plugins/openstack_cinder.py
@@ -79,3 +79,5 @@ class RedHatOpenStackCinder(OpenStackCinder, RedHatPlugin):
         super(RedHatOpenStackCinder, self).setup()
         self.add_copy_specs(["/etc/sudoers.d/cinder"])
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/openstack_glance.py b/sos/plugins/openstack_glance.py
index 134d23f..ae8851e 100644
--- a/sos/plugins/openstack_glance.py
+++ b/sos/plugins/openstack_glance.py
@@ -52,3 +52,5 @@ class RedHatOpenStackGlance(OpenStackGlance, plugins.RedHatPlugin):
 
     packages = ('openstack-glance',
                 'python-glanceclient')
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/openstack_heat.py b/sos/plugins/openstack_heat.py
index 15c26c9..68989bb 100644
--- a/sos/plugins/openstack_heat.py
+++ b/sos/plugins/openstack_heat.py
@@ -57,3 +57,5 @@ class RedHatOpenStack(OpenStackHeat, plugins.RedHatPlugin):
                 'openstack-heat-common',
                 'openstack-heat-engine',
                 'python-heatclient')
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/openstack_horizon.py b/sos/plugins/openstack_horizon.py
index 31ee561..c814b01 100644
--- a/sos/plugins/openstack_horizon.py
+++ b/sos/plugins/openstack_horizon.py
@@ -72,3 +72,5 @@ class RedHatOpenStackHorizon(OpenStackHorizon, RedHatPlugin):
         self.add_copy_specs(["/etc/httpd/conf.d/openstack-dashboard.conf"])
         if self.option_enabled("log"):
             self.add_copy_specs(["/var/log/httpd/"])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/openstack_keystone.py b/sos/plugins/openstack_keystone.py
index 0f3b654..6e94558 100644
--- a/sos/plugins/openstack_keystone.py
+++ b/sos/plugins/openstack_keystone.py
@@ -71,3 +71,5 @@ class RedHatOpenStackKeystone(OpenStackKeystone, RedHatPlugin):
                 'python-keystone',
                 'python-django-openstack-auth',
                 'python-keystoneclient')
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/openstack_neutron.py b/sos/plugins/openstack_neutron.py
index d063a7c..bda9c5e 100644
--- a/sos/plugins/openstack_neutron.py
+++ b/sos/plugins/openstack_neutron.py
@@ -88,3 +88,5 @@ class RedHatOpenStackNeutron(OpenStackNeutron, RedHatPlugin):
 
     def setup(self):
         super(RedHatOpenStackNeutron, self).setup()
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/openstack_nova.py b/sos/plugins/openstack_nova.py
index 2e7c956..d294d16 100644
--- a/sos/plugins/openstack_nova.py
+++ b/sos/plugins/openstack_nova.py
@@ -142,3 +142,5 @@ class RedHatOpenStackNova(OpenStackNova, RedHatPlugin):
                 "/etc/sudoers.d/nova",
                 "/etc/security/limits.d/91-nova.conf",
                 "/etc/sysconfig/openstack-nova-novncproxy"])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/openstack_swift.py b/sos/plugins/openstack_swift.py
index 1b67484..2514323 100644
--- a/sos/plugins/openstack_swift.py
+++ b/sos/plugins/openstack_swift.py
@@ -52,3 +52,5 @@ class RedHatOpenStackSwift(OpenStackSwift, plugins.RedHatPlugin):
                 'openstack-swift-proxy',
                 'swift',
                 'python-swiftclient')
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/openswan.py b/sos/plugins/openswan.py
index c99968c..0712c76 100644
--- a/sos/plugins/openswan.py
+++ b/sos/plugins/openswan.py
@@ -35,3 +35,5 @@ class Openswan(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         self.add_cmd_output("ipsec verify")
         if self.get_option("ipsec-barf"):
             self.add_cmd_output("ipsec barf")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/pam.py b/sos/plugins/pam.py
index 307a405..c78d4f9 100644
--- a/sos/plugins/pam.py
+++ b/sos/plugins/pam.py
@@ -43,3 +43,5 @@ class DebianPam(Pam, DebianPlugin, UbuntuPlugin):
     def setup(self):
         super(DebianPam, self).setup()
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/pci.py b/sos/plugins/pci.py
index 390776f..e15b978 100644
--- a/sos/plugins/pci.py
+++ b/sos/plugins/pci.py
@@ -34,3 +34,5 @@ class Pci(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
         self.add_cmd_output("lspci -tv")
 
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/postfix.py b/sos/plugins/postfix.py
index 6f0f9b4..0300a5b 100644
--- a/sos/plugins/postfix.py
+++ b/sos/plugins/postfix.py
@@ -48,3 +48,5 @@ class DebianPostfix(Postfix, DebianPlugin, UbuntuPlugin):
     def setup(self):
         super(DebianPostfix, self).setup()
         self.add_copy_spec("/etc/postfix/dynamicmaps.cf")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/postgresql.py b/sos/plugins/postgresql.py
index cc51195..69084af 100644
--- a/sos/plugins/postgresql.py
+++ b/sos/plugins/postgresql.py
@@ -148,4 +148,5 @@ class DebianPostgreSQL(PostgreSQL, DebianPlugin, UbuntuPlugin):
         self.add_copy_spec("/var/lib/postgresql/*/main/PG_VERSION")
         self.add_copy_spec("/var/lib/postgresql/*/main/postmaster.opts")
 
-# vim: expandtab tabstop=4 shiftwidth=4
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/powerpc.py b/sos/plugins/powerpc.py
index 9681094..11ce56d 100644
--- a/sos/plugins/powerpc.py
+++ b/sos/plugins/powerpc.py
@@ -76,3 +76,5 @@ class PowerPC(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
             if os.path.isdir("/var/log/dump"):
                 self.add_cmd_output("ls -l /var/log/dump")
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/ppp.py b/sos/plugins/ppp.py
index edb3eb4..a0446a5 100644
--- a/sos/plugins/ppp.py
+++ b/sos/plugins/ppp.py
@@ -30,3 +30,5 @@ class Ppp(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "/etc/ppp",
             "/var/log/ppp"])
         self.add_cmd_output("adsl-status")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/procenv.py b/sos/plugins/procenv.py
index d413cd1..e776e14 100644
--- a/sos/plugins/procenv.py
+++ b/sos/plugins/procenv.py
@@ -23,3 +23,5 @@ class Procenv(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
 
     def setup(self):
         self.add_cmd_output('procenv')
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/process.py b/sos/plugins/process.py
index 02eaa58..6d8f640 100644
--- a/sos/plugins/process.py
+++ b/sos/plugins/process.py
@@ -27,3 +27,5 @@ class Process(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         self.add_cmd_output("ps alxwww")
         self.add_cmd_output("pstree", root_symlink = "pstree")
         self.add_cmd_output("lsof -b +M -n -l", root_symlink = "lsof")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/processor.py b/sos/plugins/processor.py
index 3b21894..391c64f 100644
--- a/sos/plugins/processor.py
+++ b/sos/plugins/processor.py
@@ -45,3 +45,5 @@ class Processor(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
         self.add_cmd_output("lscpu")
 
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/psacct.py b/sos/plugins/psacct.py
index 74bd9f0..dadd62a 100644
--- a/sos/plugins/psacct.py
+++ b/sos/plugins/psacct.py
@@ -49,3 +49,5 @@ class DebianPsacct(Psacct, DebianPlugin, UbuntuPlugin):
         self.add_copy_specs(["/var/log/account/pacct", "/etc/default/acct"])
         if self.get_option("all"):
             self.add_copy_spec("/var/log/account/pacct*.gz")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/pxe.py b/sos/plugins/pxe.py
index fcb1a4b..7a552e8 100644
--- a/sos/plugins/pxe.py
+++ b/sos/plugins/pxe.py
@@ -51,3 +51,5 @@ class DebianPxe(Pxe, DebianPlugin, UbuntuPlugin):
         self.add_copy_spec("/etc/default/tftpd-hpa")
         if self.get_option("tftpboot"):
             self.add_copy_spec("/var/lib/tftpboot")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/qpid.py b/sos/plugins/qpid.py
index cee8443..2fda9a4 100644
--- a/sos/plugins/qpid.py
+++ b/sos/plugins/qpid.py
@@ -50,3 +50,5 @@ class Qpid(Plugin, RedHatPlugin):
             "/var/log/sesame",
             "/var/log/cumin",
             "/var/log/cluster"])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/quagga.py b/sos/plugins/quagga.py
index 909f9d4..88a41a7 100644
--- a/sos/plugins/quagga.py
+++ b/sos/plugins/quagga.py
@@ -27,3 +27,5 @@ class Quagga(Plugin, RedHatPlugin):
 
     def setup(self):
         self.add_copy_spec("/etc/quagga/")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/radius.py b/sos/plugins/radius.py
index 427fd25..a64ea35 100644
--- a/sos/plugins/radius.py
+++ b/sos/plugins/radius.py
@@ -48,3 +48,5 @@ class DebianRadius(Radius, DebianPlugin, UbuntuPlugin):
                            "/etc/pam.d/radiusd",
                            "/etc/default/freeradius",
                            "/var/log/freeradius"])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/rhui.py b/sos/plugins/rhui.py
index f0413b4..a0ef512 100644
--- a/sos/plugins/rhui.py
+++ b/sos/plugins/rhui.py
@@ -37,3 +37,5 @@ class Rhui(Plugin, RedHatPlugin):
                 % (self.rhui_debug_path, cds, rhui_debug_dst_path),
                 suggest_filename="rhui-debug")
         return
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/rpm.py b/sos/plugins/rpm.py
index 55c8019..6c1529c 100644
--- a/sos/plugins/rpm.py
+++ b/sos/plugins/rpm.py
@@ -53,3 +53,5 @@ class Rpm(Plugin, RedHatPlugin):
                     or pkg.endswith('-debuginfo-common'):
                         continue
                     self.add_cmd_output("rpm -V %s" % pkg)
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/s390.py b/sos/plugins/s390.py
index ed9546b..7645b1b 100644
--- a/sos/plugins/s390.py
+++ b/sos/plugins/s390.py
@@ -65,3 +65,5 @@ class S390(Plugin, RedHatPlugin):
             self.add_cmd_output("dasdview -x -i -j -l -f %s" % (x,))
             self.add_cmd_output("fdasd -p %s" % (x,))
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/samba.py b/sos/plugins/samba.py
index f3dc862..6efab2f 100644
--- a/sos/plugins/samba.py
+++ b/sos/plugins/samba.py
@@ -28,3 +28,5 @@ class Samba(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         self.add_cmd_output("wbinfo --domain='.' -u")
         self.add_cmd_output("testparm -s -v")
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/sanlock.py b/sos/plugins/sanlock.py
index 232dd00..4386f3f 100644
--- a/sos/plugins/sanlock.py
+++ b/sos/plugins/sanlock.py
@@ -34,3 +34,5 @@ class RedHatSANLock(SANLock, RedHatPlugin):
     def setup(self):
         super(RedHatSANLock, self).setup()
         self.add_copy_spec("/etc/sysconfig/sanlock")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/sar.py b/sos/plugins/sar.py
index 470d82f..56cc637 100644
--- a/sos/plugins/sar.py
+++ b/sos/plugins/sar.py
@@ -66,3 +66,5 @@ class DebianSar(Sar, DebianPlugin, UbuntuPlugin):
     """
     
     sa_path = '/var/log/sysstat'
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/satellite.py b/sos/plugins/satellite.py
index 28c8bca..936f3c5 100644
--- a/sos/plugins/satellite.py
+++ b/sos/plugins/satellite.py
@@ -81,3 +81,5 @@ class Satellite(Plugin, RedHatPlugin):
 
         if self.proxy:
             self.add_copy_specs(["/etc/squid", "/var/log/squid"])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/scsi.py b/sos/plugins/scsi.py
index a3f8175..84570b6 100644
--- a/sos/plugins/scsi.py
+++ b/sos/plugins/scsi.py
@@ -35,3 +35,5 @@ class Scsi(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
         
         self.add_cmd_output("lsscsi")
         self.add_cmd_output("sg_map")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/selinux.py b/sos/plugins/selinux.py
index 4b403ea..14d3679 100644
--- a/sos/plugins/selinux.py
+++ b/sos/plugins/selinux.py
@@ -43,3 +43,5 @@ class SELinux(Plugin, RedHatPlugin):
             self.add_cmd_output("semanage login -l")
             self.add_cmd_output("semanage port -l")
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/sendmail.py b/sos/plugins/sendmail.py
index 4efbf95..1e25e32 100644
--- a/sos/plugins/sendmail.py
+++ b/sos/plugins/sendmail.py
@@ -47,3 +47,5 @@ class DebianSendmail(Sendmail, DebianPlugin, UbuntuPlugin):
     def setup(self):
         super(DebianSendmail, self).setup()
         self.add_copy_specs(["/etc/mail/*", "/var/log/mail.*"])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/smartcard.py b/sos/plugins/smartcard.py
index 207f07a..65d4a11 100644
--- a/sos/plugins/smartcard.py
+++ b/sos/plugins/smartcard.py
@@ -33,3 +33,5 @@ class Smartcard(Plugin, RedHatPlugin):
         self.add_cmd_output("pkcs11_inspect debug")
         self.add_cmd_output("pklogin_finder debug")
         self.add_cmd_output("ls -nl /usr/lib*/pam_pkcs11/")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/snmp.py b/sos/plugins/snmp.py
index 177c0e2..a9026d1 100644
--- a/sos/plugins/snmp.py
+++ b/sos/plugins/snmp.py
@@ -44,3 +44,5 @@ class DebianSnmp(Snmp, DebianPlugin, UbuntuPlugin):
 
     def setup(self):
         super(DebianSnmp, self).setup()
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/soundcard.py b/sos/plugins/soundcard.py
index b92b4c5..6b13a2d 100644
--- a/sos/plugins/soundcard.py
+++ b/sos/plugins/soundcard.py
@@ -52,3 +52,5 @@ class DebianSoundcard(Soundcard, DebianPlugin, UbuntuPlugin):
         super(DebianSoundcard, self).setup()
 
         self.add_copy_spec("/etc/pulse/*")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/squid.py b/sos/plugins/squid.py
index bf6579b..7ef96f2 100644
--- a/sos/plugins/squid.py
+++ b/sos/plugins/squid.py
@@ -45,3 +45,5 @@ class DebianSquid(Squid, DebianPlugin, UbuntuPlugin):
     def setup(self):
         self.add_copy_spec_limit("/etc/squid3/squid.conf",
                         sizelimit=self.get_option('logsize'))
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/ssh.py b/sos/plugins/ssh.py
index 1abfc2a..0900818 100644
--- a/sos/plugins/ssh.py
+++ b/sos/plugins/ssh.py
@@ -24,3 +24,5 @@ class Ssh(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
 
     def setup(self):
         self.add_copy_specs(["/etc/ssh/ssh_config", "/etc/ssh/sshd_config"])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/sssd.py b/sos/plugins/sssd.py
index 0d201f4..40d88db 100644
--- a/sos/plugins/sssd.py
+++ b/sos/plugins/sssd.py
@@ -48,3 +48,5 @@ class DebianSssd(Sssd, DebianPlugin, UbuntuPlugin):
     def setup(self):
         super(DebianSssd, self).setup()
         self.add_copy_specs(["/etc/default/sssd"])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/startup.py b/sos/plugins/startup.py
index 76d85ef..60d4086 100644
--- a/sos/plugins/startup.py
+++ b/sos/plugins/startup.py
@@ -46,3 +46,5 @@ class DebianStartup(Startup, DebianPlugin, UbuntuPlugin):
         self.add_cmd_output("/sbin/initctl show-config", root_symlink = "initctl")
         if self.get_option('servicestatus'):
             self.add_cmd_output("/sbin/initctl list")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/sunrpc.py b/sos/plugins/sunrpc.py
index 3dab2ce..124f2fa 100644
--- a/sos/plugins/sunrpc.py
+++ b/sos/plugins/sunrpc.py
@@ -52,3 +52,5 @@ class RedHatSunRPC(SunRPC, RedHatPlugin):
 #        return
 
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/system.py b/sos/plugins/system.py
index a7e3eda..a819224 100644
--- a/sos/plugins/system.py
+++ b/sos/plugins/system.py
@@ -27,3 +27,5 @@ class System(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         self.add_forbidden_path(
                 "/proc/sys/net/ipv6/neigh/*/base_reachable_time")
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/systemd.py b/sos/plugins/systemd.py
index 38be63e..acb2bf9 100644
--- a/sos/plugins/systemd.py
+++ b/sos/plugins/systemd.py
@@ -47,3 +47,5 @@ class Systemd(Plugin, RedHatPlugin):
                            "/etc/vconsole.conf",
                            "/etc/yum/protected.d/systemd.conf"])
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/systemtap.py b/sos/plugins/systemtap.py
index 213dcdb..e58537b 100644
--- a/sos/plugins/systemtap.py
+++ b/sos/plugins/systemtap.py
@@ -28,3 +28,5 @@ class SystemTap(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     def setup(self):
         self.add_cmd_output("stap -V 2")
         self.add_cmd_output("uname -r")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/sysvipc.py b/sos/plugins/sysvipc.py
index d8b68fe..1d4260c 100644
--- a/sos/plugins/sysvipc.py
+++ b/sos/plugins/sysvipc.py
@@ -27,3 +27,5 @@ class SysVIPC(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
                 "/proc/sysvipc/sem",
                 "/proc/sysvipc/shm"])
         self.add_cmd_output("ipcs")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/tftpserver.py b/sos/plugins/tftpserver.py
index c6089ed..49c69b5 100644
--- a/sos/plugins/tftpserver.py
+++ b/sos/plugins/tftpserver.py
@@ -27,3 +27,5 @@ class TftpServer(Plugin, RedHatPlugin):
 
     def setup(self):
         self.add_cmd_output("ls -lanR /tftpboot")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/tomcat.py b/sos/plugins/tomcat.py
index d4e1ac6..60b4180 100644
--- a/sos/plugins/tomcat.py
+++ b/sos/plugins/tomcat.py
@@ -24,3 +24,5 @@ class Tomcat(Plugin, RedHatPlugin):
 
     def setup(self):
         self.add_copy_specs(["/etc/tomcat5", "/var/log/tomcat5"])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/tuned.py b/sos/plugins/tuned.py
index 60c22bc..196a41c 100644
--- a/sos/plugins/tuned.py
+++ b/sos/plugins/tuned.py
@@ -28,3 +28,5 @@ class Tuned(Plugin, RedHatPlugin):
         self.add_cmd_output("tuned-adm recommend")
         self.add_copy_spec("/var/log/tuned/tuned.log")
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/udev.py b/sos/plugins/udev.py
index 47f2d26..e554a88 100644
--- a/sos/plugins/udev.py
+++ b/sos/plugins/udev.py
@@ -26,3 +26,5 @@ class Udev(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "/lib/udev/rules.d",
             "/etc/udev/rules.d/*"
         ])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/upstart.py b/sos/plugins/upstart.py
index 5aa0e1d..1d088a6 100644
--- a/sos/plugins/upstart.py
+++ b/sos/plugins/upstart.py
@@ -39,3 +39,5 @@ class Upstart(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         # Session Jobs (running Upstart as a Session Init)
         self.add_copy_spec('/usr/share/upstart/')
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/usb.py b/sos/plugins/usb.py
index 8e58317..49ffadb 100644
--- a/sos/plugins/usb.py
+++ b/sos/plugins/usb.py
@@ -30,3 +30,5 @@ class Usb(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         self.add_cmd_output("lsusb -t")
 
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/veritas.py b/sos/plugins/veritas.py
index 4a2ce57..38824df 100644
--- a/sos/plugins/veritas.py
+++ b/sos/plugins/veritas.py
@@ -40,3 +40,5 @@ class Veritas(Plugin, RedHatPlugin):
                 self.add_copy_spec(tarfile[0])
         except AttributeError as e:
             self.add_alert(e)
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/vmware.py b/sos/plugins/vmware.py
index 3a23dd3..b583d5c 100644
--- a/sos/plugins/vmware.py
+++ b/sos/plugins/vmware.py
@@ -27,3 +27,5 @@ class VMWare(Plugin, RedHatPlugin):
         self.add_copy_specs(["/etc/vmware/locations",
                            "/etc/vmware/config",
                            "/proc/vmmemctl"])
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/vsftpd.py b/sos/plugins/vsftpd.py
index 4cf58cf..787f99e 100644
--- a/sos/plugins/vsftpd.py
+++ b/sos/plugins/vsftpd.py
@@ -26,3 +26,5 @@ class Vsftpd(Plugin, RedHatPlugin):
     def setup(self):
         self.add_copy_spec("/etc/ftp*")
         self.add_copy_spec("/etc/vsftpd")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/x11.py b/sos/plugins/x11.py
index 15730c6..7a548f4 100644
--- a/sos/plugins/x11.py
+++ b/sos/plugins/x11.py
@@ -30,3 +30,5 @@ class X11(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         ])
         self.add_forbidden_path("/etc/X11/X")
         self.add_forbidden_path("/etc/X11/fontpath.d")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/xen.py b/sos/plugins/xen.py
index 1bbeaf5..fef356b 100644
--- a/sos/plugins/xen.py
+++ b/sos/plugins/xen.py
@@ -98,3 +98,5 @@ class Xen(Plugin, RedHatPlugin):
             return #USEFUL
 
         self.add_custom_text("Xen hostType: "+host_type)
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/xfs.py b/sos/plugins/xfs.py
index 1f4dd50..3bef675 100644
--- a/sos/plugins/xfs.py
+++ b/sos/plugins/xfs.py
@@ -38,3 +38,5 @@ class Xfs(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
                 for e in dev:
                     parts = e.split(' ')
                     self.add_cmd_output("xfs_logprint -c %s" % (parts[0]))
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/xinetd.py b/sos/plugins/xinetd.py
index e561044..d07c435 100644
--- a/sos/plugins/xinetd.py
+++ b/sos/plugins/xinetd.py
@@ -28,3 +28,5 @@ class Xinetd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     def setup(self):
         self.add_copy_spec("/etc/xinetd.conf")
         self.add_copy_spec("/etc/xinetd.d")
+
+# vim: et ts=4 sw=4
diff --git a/sos/plugins/yum.py b/sos/plugins/yum.py
index b05c0fe..9aa6131 100644
--- a/sos/plugins/yum.py
+++ b/sos/plugins/yum.py
@@ -63,3 +63,5 @@ class Yum(Plugin, RedHatPlugin):
                 self.add_cmd_output("zcat %s" % (output.split()[-1],))
             except IndexError:
                 pass
+
+# vim: et ts=4 sw=4
diff --git a/sos/policies/__init__.py b/sos/policies/__init__.py
index 08ce8b4..3ae3979 100644
--- a/sos/policies/__init__.py
+++ b/sos/policies/__init__.py
@@ -419,3 +419,5 @@ class LinuxPolicy(Policy):
         
         return
 
+
+# vim: et ts=4 sw=4
diff --git a/sos/policies/debian.py b/sos/policies/debian.py
index ffa4a26..80bbc88 100644
--- a/sos/policies/debian.py
+++ b/sos/policies/debian.py
@@ -36,3 +36,5 @@ class DebianPolicy(LinuxPolicy):
         except:
             pass
         return False
+
+# vim: et ts=4 sw=4
diff --git a/sos/policies/osx.py b/sos/policies/osx.py
index 767b608..2e3c5ac 100644
--- a/sos/policies/osx.py
+++ b/sos/policies/osx.py
@@ -11,3 +11,5 @@ class OSXPolicy(Policy):
             return "Mac OS X" in shell_out("sw_vers")
         except Exception as e:
             return False
+
+# vim: et ts=4 sw=4
diff --git a/sos/policies/redhat.py b/sos/policies/redhat.py
index 4e5b363..2eade3a 100644
--- a/sos/policies/redhat.py
+++ b/sos/policies/redhat.py
@@ -155,4 +155,5 @@ class FedoraPolicy(RedHatPolicy):
         self.all_pkgs_by_name_regex("fedora-release-.*")[-1]
         return int(pkg["version"])
 
-# vim: ts=4 sw=4 et
+
+# vim: et ts=4 sw=4
diff --git a/sos/policies/ubuntu.py b/sos/policies/ubuntu.py
index 3039f43..cc83f92 100644
--- a/sos/policies/ubuntu.py
+++ b/sos/policies/ubuntu.py
@@ -23,3 +23,5 @@ class UbuntuPolicy(DebianPolicy):
                 return "Ubuntu" in fp.read()
         except:
             return False
+
+# vim: et ts=4 sw=4
diff --git a/sos/policies/windows.py b/sos/policies/windows.py
index f2ce48c..f3bbc7e 100644
--- a/sos/policies/windows.py
+++ b/sos/policies/windows.py
@@ -44,3 +44,5 @@ class WindowsPolicy(Policy):
     def preferred_archive_name(self):
         from sos.archive import ZipFileArchive
         return ZipFileArchive
+
+# vim: et ts=4 sw=4
diff --git a/sos/reporting.py b/sos/reporting.py
index 1671919..039a75f 100644
--- a/sos/reporting.py
+++ b/sos/reporting.py
@@ -131,3 +131,5 @@ class PlainTextReport(object):
             self.buf.append(header)
             for item in section.get(key):
                 self.buf.append(format_ % item)
+
+# vim: et ts=4 sw=4
diff --git a/sos/sosreport.py b/sos/sosreport.py
index afa5371..8483d10 100644
--- a/sos/sosreport.py
+++ b/sos/sosreport.py
@@ -1151,3 +1151,5 @@ def main(args):
     """The main entry point"""
     sos = SoSReport(args)
     sos.execute()
+
+# vim: et ts=4 sw=4
diff --git a/sos/utilities.py b/sos/utilities.py
index 1a56f9f..e5d7d87 100644
--- a/sos/utilities.py
+++ b/sos/utilities.py
@@ -247,3 +247,5 @@ class ImporterHelper(object):
                 plugins.extend(self._find_plugins_in_zipfile(path))
 
         return plugins
+
+# vim: et ts=4 sw=4
diff --git a/tests/archive_tests.py b/tests/archive_tests.py
index 9cd7bd1..d26af1d 100644
--- a/tests/archive_tests.py
+++ b/tests/archive_tests.py
@@ -172,3 +172,5 @@ class TarFileArchiveTest(unittest.TestCase):
 
 if __name__ == "__main__":
     unittest.main()
+
+# vim: et ts=4 sw=4
diff --git a/tests/importer_tests.py b/tests/importer_tests.py
index 91f82cc..e7e20a2 100644
--- a/tests/importer_tests.py
+++ b/tests/importer_tests.py
@@ -11,3 +11,5 @@ class ImporterHelperTests(unittest.TestCase):
 
 if __name__ == "__main__":
     unittest.main()
+
+# vim: et ts=4 sw=4
diff --git a/tests/option_tests.py b/tests/option_tests.py
index d221b96..3185bce 100644
--- a/tests/option_tests.py
+++ b/tests/option_tests.py
@@ -32,3 +32,5 @@ class GlobalOptionTest(unittest.TestCase):
 
 if __name__ == "__main__":
     unittest.main()
+
+# vim: et ts=4 sw=4
diff --git a/tests/plugin_tests.py b/tests/plugin_tests.py
index 5eb1304..9a21b61 100644
--- a/tests/plugin_tests.py
+++ b/tests/plugin_tests.py
@@ -304,3 +304,5 @@ class RegexSubTests(unittest.TestCase):
 
 if __name__ == "__main__":
     unittest.main()
+
+# vim: et ts=4 sw=4
diff --git a/tests/policy_tests.py b/tests/policy_tests.py
index 764af83..fe208fc 100644
--- a/tests/policy_tests.py
+++ b/tests/policy_tests.py
@@ -67,3 +67,5 @@ class PackageManagerTests(unittest.TestCase):
 
 if __name__ == "__main__":
     unittest.main()
+
+# vim: et ts=4 sw=4
diff --git a/tests/report_tests.py b/tests/report_tests.py
index a08f0ae..5bb1d83 100644
--- a/tests/report_tests.py
+++ b/tests/report_tests.py
@@ -116,3 +116,5 @@ class TestPlainReport(unittest.TestCase):
 
 if __name__ == "__main__":
     unittest.main()
+
+# vim: et ts=4 sw=4
diff --git a/tests/sosreport_pexpect.py b/tests/sosreport_pexpect.py
index 164fa9c..4b80723 100644
--- a/tests/sosreport_pexpect.py
+++ b/tests/sosreport_pexpect.py
@@ -26,3 +26,5 @@ class PexpectTest(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main()
+
+# vim: et ts=4 sw=4
diff --git a/tests/test_exe.py b/tests/test_exe.py
index 09b2813..ee493b7 100755
--- a/tests/test_exe.py
+++ b/tests/test_exe.py
@@ -1,2 +1,4 @@
 #!/usr/bin/python
 print "executed"
+
+# vim: et ts=4 sw=4
diff --git a/tests/utilities_tests.py b/tests/utilities_tests.py
index 395fde1..f3b1629 100644
--- a/tests/utilities_tests.py
+++ b/tests/utilities_tests.py
@@ -86,3 +86,5 @@ class FindTest(unittest.TestCase):
     def test_not_in_pattern(self):
         leaves = find("leaf", TEST_DIR, path_pattern="tests/path")
         self.assertFalse(any(name.endswith("leaf") for name in leaves))
+
+# vim: et ts=4 sw=4
-- 
1.9.3