diff --git a/plugins/Admin/config.py b/plugins/Admin/config.py
index 65edfa05a..c966da04a 100644
--- a/plugins/Admin/config.py
+++ b/plugins/Admin/config.py
@@ -45,4 +45,4 @@ Admin = conf.registerPlugin('Admin')
 # conf.registerGlobalValue(Admin, 'someConfigVariableName',
 #     registry.Boolean(False, """Help for someConfigVariableName."""))
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Admin/plugin.py b/plugins/Admin/plugin.py
index 3de8e4de4..d220caef0 100644
--- a/plugins/Admin/plugin.py
+++ b/plugins/Admin/plugin.py
@@ -331,4 +331,4 @@ class Admin(callbacks.Plugin):
 
 Class = Admin
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Admin/test.py b/plugins/Admin/test.py
index 1606613ff..4fe7616c7 100644
--- a/plugins/Admin/test.py
+++ b/plugins/Admin/test.py
@@ -113,5 +113,5 @@ class AdminTestCase(PluginTestCase):
         self.assertError('admin addcapability %s owner' % self.nick)
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/Alias/__init__.py b/plugins/Alias/__init__.py
index 28ef146d4..a215d6d26 100644
--- a/plugins/Alias/__init__.py
+++ b/plugins/Alias/__init__.py
@@ -58,4 +58,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Alias/config.py b/plugins/Alias/config.py
index b8cfdc873..6f9968415 100644
--- a/plugins/Alias/config.py
+++ b/plugins/Alias/config.py
@@ -41,4 +41,4 @@ def configure(advanced):
 Alias = conf.registerPlugin('Alias')
 conf.registerGroup(Alias, 'aliases')
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Alias/plugin.py b/plugins/Alias/plugin.py
index dbdd1d1ea..38dd6f809 100644
--- a/plugins/Alias/plugin.py
+++ b/plugins/Alias/plugin.py
@@ -303,4 +303,4 @@ class Alias(callbacks.Plugin):
 
 Class = Alias
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Alias/test.py b/plugins/Alias/test.py
index 254dbe4b3..016e759ff 100644
--- a/plugins/Alias/test.py
+++ b/plugins/Alias/test.py
@@ -121,4 +121,4 @@ class AliasTestCase(ChannelPluginTestCase):
 
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Anonymous/__init__.py b/plugins/Anonymous/__init__.py
index f8171034e..59cbc372d 100644
--- a/plugins/Anonymous/__init__.py
+++ b/plugins/Anonymous/__init__.py
@@ -58,4 +58,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Anonymous/config.py b/plugins/Anonymous/config.py
index b9e903ec9..5b2fd0944 100644
--- a/plugins/Anonymous/config.py
+++ b/plugins/Anonymous/config.py
@@ -60,4 +60,4 @@ conf.registerGlobalValue(conf.supybot.plugins.Anonymous, 'allowPrivateTarget',
     other users."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Anonymous/plugin.py b/plugins/Anonymous/plugin.py
index 4910b653d..938972da8 100644
--- a/plugins/Anonymous/plugin.py
+++ b/plugins/Anonymous/plugin.py
@@ -93,4 +93,4 @@ class Anonymous(callbacks.Plugin):
 Class = Anonymous
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Anonymous/test.py b/plugins/Anonymous/test.py
index 7791b38e5..33da2530a 100644
--- a/plugins/Anonymous/test.py
+++ b/plugins/Anonymous/test.py
@@ -53,4 +53,4 @@ class AnonymousTestCase(ChannelPluginTestCase):
             conf.supybot.plugins.Anonymous.requireRegistration.setValue(orig)
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/AutoMode/__init__.py b/plugins/AutoMode/__init__.py
index 6c7f77eda..713ccada0 100644
--- a/plugins/AutoMode/__init__.py
+++ b/plugins/AutoMode/__init__.py
@@ -59,4 +59,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/AutoMode/config.py b/plugins/AutoMode/config.py
index 43c4f2ef9..4299b84a6 100644
--- a/plugins/AutoMode/config.py
+++ b/plugins/AutoMode/config.py
@@ -66,4 +66,4 @@ conf.registerChannelValue(AutoMode.ban, 'period',
 
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/AutoMode/plugin.py b/plugins/AutoMode/plugin.py
index 4af639350..6db8f997b 100644
--- a/plugins/AutoMode/plugin.py
+++ b/plugins/AutoMode/plugin.py
@@ -85,4 +85,4 @@ class AutoMode(callbacks.Plugin):
 
 Class = AutoMode
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/AutoMode/test.py b/plugins/AutoMode/test.py
index d29f6e1a4..9ea27dc43 100644
--- a/plugins/AutoMode/test.py
+++ b/plugins/AutoMode/test.py
@@ -33,4 +33,4 @@ class AutoModeTestCase(PluginTestCase):
     plugins = ('AutoMode',)
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Channel/config.py b/plugins/Channel/config.py
index 9c719f60a..cd66c1898 100644
--- a/plugins/Channel/config.py
+++ b/plugins/Channel/config.py
@@ -78,4 +78,4 @@ conf.registerChannelValue(Channel, 'banmask',
     default banmask style."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Channel/plugin.py b/plugins/Channel/plugin.py
index ddf7f7079..789a19fac 100644
--- a/plugins/Channel/plugin.py
+++ b/plugins/Channel/plugin.py
@@ -802,4 +802,4 @@ class Channel(callbacks.Plugin):
 
 Class = Channel
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Channel/test.py b/plugins/Channel/test.py
index ca98fa265..deec95dfa 100644
--- a/plugins/Channel/test.py
+++ b/plugins/Channel/test.py
@@ -186,5 +186,5 @@ class ChannelTestCase(ChannelPluginTestCase):
         self.assertNotError('channel ignore remove foo!bar@baz')
         self.assertError('ban add not!a.hostmask')
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/ChannelLogger/__init__.py b/plugins/ChannelLogger/__init__.py
index 99b9871c7..886b7904a 100644
--- a/plugins/ChannelLogger/__init__.py
+++ b/plugins/ChannelLogger/__init__.py
@@ -57,4 +57,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/ChannelLogger/config.py b/plugins/ChannelLogger/config.py
index a480a2a35..398e0218c 100644
--- a/plugins/ChannelLogger/config.py
+++ b/plugins/ChannelLogger/config.py
@@ -84,4 +84,4 @@ conf.registerGlobalValue(ChannelLogger.timestamp, 'format',
     the directory stucture for channel logs if
     supybot.plugins.ChannelLogger.directories.timestamp is True."""))
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/ChannelLogger/plugin.py b/plugins/ChannelLogger/plugin.py
index fe448a790..16687697d 100644
--- a/plugins/ChannelLogger/plugin.py
+++ b/plugins/ChannelLogger/plugin.py
@@ -259,4 +259,4 @@ class ChannelLogger(callbacks.Plugin):
 
 
 Class = ChannelLogger
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/ChannelLogger/test.py b/plugins/ChannelLogger/test.py
index c1a8dcf6b..0b8712400 100644
--- a/plugins/ChannelLogger/test.py
+++ b/plugins/ChannelLogger/test.py
@@ -33,4 +33,4 @@ class ChannelLoggerTestCase(PluginTestCase):
     plugins = ('ChannelLogger',)
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/ChannelStats/__init__.py b/plugins/ChannelStats/__init__.py
index 0ac6bda27..eb4d637d4 100644
--- a/plugins/ChannelStats/__init__.py
+++ b/plugins/ChannelStats/__init__.py
@@ -59,4 +59,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/ChannelStats/config.py b/plugins/ChannelStats/config.py
index e6efc78f6..448aaa239 100644
--- a/plugins/ChannelStats/config.py
+++ b/plugins/ChannelStats/config.py
@@ -66,4 +66,4 @@ conf.registerChannelValue(ChannelStats, 'frowns',
     (i.e., pieces of text with no spaces in them ) are considered 'frowns' for
     the purposes of stats-keeping."""))
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/ChannelStats/plugin.py b/plugins/ChannelStats/plugin.py
index 2b70fbeb2..c545143a9 100644
--- a/plugins/ChannelStats/plugin.py
+++ b/plugins/ChannelStats/plugin.py
@@ -304,4 +304,4 @@ class ChannelStats(callbacks.Plugin):
 
 Class = ChannelStats
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/ChannelStats/test.py b/plugins/ChannelStats/test.py
index 65f24e2db..afe0bafc3 100644
--- a/plugins/ChannelStats/test.py
+++ b/plugins/ChannelStats/test.py
@@ -76,5 +76,5 @@ class ChannelStatsTestCase(ChannelPluginTestCase):
         self.assertNotRegexp('stats sweede', 'KeyError')
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/Config/config.py b/plugins/Config/config.py
index 1e788d674..a6e705155 100644
--- a/plugins/Config/config.py
+++ b/plugins/Config/config.py
@@ -45,4 +45,4 @@ Config = conf.registerPlugin('Config')
 # conf.registerGlobalValue(Config, 'someConfigVariableName',
 #     registry.Boolean(False, """Help for someConfigVariableName."""))
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Config/plugin.py b/plugins/Config/plugin.py
index 46fb7481a..d42a9130b 100644
--- a/plugins/Config/plugin.py
+++ b/plugins/Config/plugin.py
@@ -263,4 +263,4 @@ class Config(callbacks.Plugin):
 
 Class = Config
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Config/test.py b/plugins/Config/test.py
index 0d1eedbd8..c5280393d 100644
--- a/plugins/Config/test.py
+++ b/plugins/Config/test.py
@@ -79,5 +79,5 @@ class ConfigTestCase(ChannelPluginTestCase):
                           'True or False')
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/Ctcp/__init__.py b/plugins/Ctcp/__init__.py
index ed126ed4f..0a2ddc4c6 100644
--- a/plugins/Ctcp/__init__.py
+++ b/plugins/Ctcp/__init__.py
@@ -56,4 +56,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Ctcp/config.py b/plugins/Ctcp/config.py
index 70b735401..e42f1c067 100644
--- a/plugins/Ctcp/config.py
+++ b/plugins/Ctcp/config.py
@@ -65,4 +65,4 @@ conf.registerGlobalValue(conf.supybot.abuse.flood.ctcp, 'punishment',
     registry.PositiveInteger(300, """Determines how many seconds the bot will
     ignore CTCP messages from users who flood it with CTCP messages."""))
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Ctcp/plugin.py b/plugins/Ctcp/plugin.py
index 6cbc5a3e3..5f6b49665 100644
--- a/plugins/Ctcp/plugin.py
+++ b/plugins/Ctcp/plugin.py
@@ -149,4 +149,4 @@ class Ctcp(callbacks.PluginRegexp):
     version = wrap(version, ['channel', getopts({'nicks':''})])
 
 Class = Ctcp
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Ctcp/test.py b/plugins/Ctcp/test.py
index a600018ad..24d224094 100644
--- a/plugins/Ctcp/test.py
+++ b/plugins/Ctcp/test.py
@@ -33,5 +33,5 @@ class CtcpTestCase(PluginTestCase):
     plugins = ('Ctcp',)
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/Dict/__init__.py b/plugins/Dict/__init__.py
index 390bcc68a..f532e67fe 100644
--- a/plugins/Dict/__init__.py
+++ b/plugins/Dict/__init__.py
@@ -55,4 +55,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Dict/config.py b/plugins/Dict/config.py
index 5a52befb1..9c7091c9e 100644
--- a/plugins/Dict/config.py
+++ b/plugins/Dict/config.py
@@ -47,4 +47,4 @@ conf.registerChannelValue(Dict, 'default',
     ask for definitions in.  If this value is '*' (without the quotes) the bot
     will use all dictionaries to define words."""))
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Dict/plugin.py b/plugins/Dict/plugin.py
index ca41dabfb..bd85f51fc 100644
--- a/plugins/Dict/plugin.py
+++ b/plugins/Dict/plugin.py
@@ -121,4 +121,4 @@ class Dict(callbacks.Plugin):
 Class = Dict
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Dict/test.py b/plugins/Dict/test.py
index cdc38ad60..dd3f380a1 100644
--- a/plugins/Dict/test.py
+++ b/plugins/Dict/test.py
@@ -44,4 +44,4 @@ class DictTestCase(PluginTestCase):
             self.assertNotError('random')
             self.assertNotError('dict [random] moo')
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Filter/__init__.py b/plugins/Filter/__init__.py
index 9d93d487b..3ae7bce8a 100644
--- a/plugins/Filter/__init__.py
+++ b/plugins/Filter/__init__.py
@@ -56,4 +56,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Filter/config.py b/plugins/Filter/config.py
index 90586e757..6c8270f01 100644
--- a/plugins/Filter/config.py
+++ b/plugins/Filter/config.py
@@ -54,4 +54,4 @@ def configure(advanced):
     from supybot.questions import expect, anything, something, yn
     conf.registerPlugin('Filter', True)
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Filter/plugin.py b/plugins/Filter/plugin.py
index 47af3f0a8..0a054db4e 100644
--- a/plugins/Filter/plugin.py
+++ b/plugins/Filter/plugin.py
@@ -613,4 +613,4 @@ class Filter(callbacks.Plugin):
 Class = Filter
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Filter/test.py b/plugins/Filter/test.py
index 312b9c5c4..15a15b4a2 100644
--- a/plugins/Filter/test.py
+++ b/plugins/Filter/test.py
@@ -166,4 +166,4 @@ class FilterTest(ChannelPluginTestCase):
         self.assertResponse('shrink internationalization, localization',
                             'i18n, l10n')
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Format/__init__.py b/plugins/Format/__init__.py
index 465a01530..f650ca4d3 100644
--- a/plugins/Format/__init__.py
+++ b/plugins/Format/__init__.py
@@ -55,4 +55,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Format/config.py b/plugins/Format/config.py
index a224f0301..523fad789 100644
--- a/plugins/Format/config.py
+++ b/plugins/Format/config.py
@@ -45,4 +45,4 @@ Format = conf.registerPlugin('Format')
 #     registry.Boolean(False, """Help for someConfigVariableName."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79
diff --git a/plugins/Format/plugin.py b/plugins/Format/plugin.py
index 766fa97dc..48bf0344d 100644
--- a/plugins/Format/plugin.py
+++ b/plugins/Format/plugin.py
@@ -190,4 +190,4 @@ class Format(callbacks.Plugin):
 
 Class = Format
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Format/test.py b/plugins/Format/test.py
index e3eb7105e..4b79b3cf4 100644
--- a/plugins/Format/test.py
+++ b/plugins/Format/test.py
@@ -86,4 +86,4 @@ class FormatTestCase(PluginTestCase):
         self.assertResponse('field 2 foo bar baz', 'bar')
         self.assertResponse('field -1 foo bar baz', 'baz')
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Games/__init__.py b/plugins/Games/__init__.py
index 1299eded9..d0bd1cca8 100644
--- a/plugins/Games/__init__.py
+++ b/plugins/Games/__init__.py
@@ -57,4 +57,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Games/config.py b/plugins/Games/config.py
index e8cb826e3..40d9bd598 100644
--- a/plugins/Games/config.py
+++ b/plugins/Games/config.py
@@ -42,4 +42,4 @@ def configure(advanced):
 Games = conf.registerPlugin('Games')
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Games/plugin.py b/plugins/Games/plugin.py
index 26c38ece1..b4c8edf37 100644
--- a/plugins/Games/plugin.py
+++ b/plugins/Games/plugin.py
@@ -166,4 +166,4 @@ class Games(callbacks.Plugin):
 Class = Games
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Games/test.py b/plugins/Games/test.py
index 630ed9380..e5663c7ee 100644
--- a/plugins/Games/test.py
+++ b/plugins/Games/test.py
@@ -54,4 +54,4 @@ class GamesTestCase(ChannelPluginTestCase):
         self.assertNotError('eightball ab')
         self.assertNotError('eightball abc')
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Google/SOAP.py b/plugins/Google/SOAP.py
index 3ea5cd229..147c716c4 100644
--- a/plugins/Google/SOAP.py
+++ b/plugins/Google/SOAP.py
@@ -3974,4 +3974,4 @@ class SOAPServer(SocketServer.TCPServer):
     def registerKWFunction(self, function, namespace = '', funcName = None):
         self.registerFunction(MethodSig(function,keywords=1), namespace,
         funcName)
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Google/__init__.py b/plugins/Google/__init__.py
index bd1bed618..8ee916753 100644
--- a/plugins/Google/__init__.py
+++ b/plugins/Google/__init__.py
@@ -57,4 +57,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Google/config.py b/plugins/Google/config.py
index d1378a77e..f66c7b565 100644
--- a/plugins/Google/config.py
+++ b/plugins/Google/config.py
@@ -133,4 +133,4 @@ conf.registerGlobalValue(Google.state, 'time',
     spent searching for this bot.  You shouldn't modify this."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Google/plugin.py b/plugins/Google/plugin.py
index 93ef42607..eee758750 100644
--- a/plugins/Google/plugin.py
+++ b/plugins/Google/plugin.py
@@ -411,4 +411,4 @@ class Google(callbacks.PluginRegexp):
 Class = Google
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Google/test.py b/plugins/Google/test.py
index 952546b2f..9735c4609 100644
--- a/plugins/Google/test.py
+++ b/plugins/Google/test.py
@@ -117,4 +117,4 @@ class GoogleTestCase(ChannelPluginTestCase):
         self.assertNotError('google stats')
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Herald/__init__.py b/plugins/Herald/__init__.py
index ff099ea26..2c8400dfd 100644
--- a/plugins/Herald/__init__.py
+++ b/plugins/Herald/__init__.py
@@ -56,4 +56,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Herald/config.py b/plugins/Herald/config.py
index ad478a531..34227d820 100644
--- a/plugins/Herald/config.py
+++ b/plugins/Herald/config.py
@@ -65,4 +65,4 @@ conf.registerChannelValue(Herald.default, 'public',
     registry.Boolean(False, """Determines whether the default herald will be
     sent publicly."""))
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Herald/plugin.py b/plugins/Herald/plugin.py
index 477051a48..84f9c34c7 100644
--- a/plugins/Herald/plugin.py
+++ b/plugins/Herald/plugin.py
@@ -227,4 +227,4 @@ class Herald(callbacks.Plugin):
 
 Class = Herald
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Herald/test.py b/plugins/Herald/test.py
index da7aea336..d51677be3 100644
--- a/plugins/Herald/test.py
+++ b/plugins/Herald/test.py
@@ -33,5 +33,5 @@ class HeraldTestCase(PluginTestCase):
     plugins = ('Herald',)
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/Internet/__init__.py b/plugins/Internet/__init__.py
index f9e52e2e7..4c307b33c 100644
--- a/plugins/Internet/__init__.py
+++ b/plugins/Internet/__init__.py
@@ -57,4 +57,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Internet/config.py b/plugins/Internet/config.py
index 09498e07b..95229a804 100644
--- a/plugins/Internet/config.py
+++ b/plugins/Internet/config.py
@@ -45,4 +45,4 @@ Internet = conf.registerPlugin('Internet')
 #     registry.Boolean(False, """Help for someConfigVariableName."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Internet/plugin.py b/plugins/Internet/plugin.py
index 047a682a8..5e90b6148 100644
--- a/plugins/Internet/plugin.py
+++ b/plugins/Internet/plugin.py
@@ -170,4 +170,4 @@ class Internet(callbacks.Plugin):
 Class = Internet
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Internet/test.py b/plugins/Internet/test.py
index 1ffe9e901..a6ad5a934 100644
--- a/plugins/Internet/test.py
+++ b/plugins/Internet/test.py
@@ -46,4 +46,4 @@ class InternetTestCase(PluginTestCase):
             self.assertNotError('internet whois inria.fr')
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Karma/__init__.py b/plugins/Karma/__init__.py
index 47820cd1a..2d2b79ac6 100644
--- a/plugins/Karma/__init__.py
+++ b/plugins/Karma/__init__.py
@@ -58,4 +58,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Karma/config.py b/plugins/Karma/config.py
index 28fe68086..236397a5d 100644
--- a/plugins/Karma/config.py
+++ b/plugins/Karma/config.py
@@ -59,4 +59,4 @@ conf.registerChannelValue(conf.supybot.plugins.Karma, 'allowUnaddressedKarma',
     registry.Boolean(False, """Determines whether the bot will
     increase/decrease karma without being addressed."""))
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Karma/plugin.py b/plugins/Karma/plugin.py
index ede077eab..cdf678b8d 100644
--- a/plugins/Karma/plugin.py
+++ b/plugins/Karma/plugin.py
@@ -398,4 +398,4 @@ class Karma(callbacks.Plugin):
 
 Class = Karma
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Karma/test.py b/plugins/Karma/test.py
index 1e38d23e0..e12ec01e5 100644
--- a/plugins/Karma/test.py
+++ b/plugins/Karma/test.py
@@ -208,4 +208,4 @@ if sqlite is not None:
                 karma.response.setValue(resp)
                 karma.allowUnaddressedKarma.setValue(unaddressed)
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Lart/__init__.py b/plugins/Lart/__init__.py
index b5c2e8e7c..d3f83d669 100644
--- a/plugins/Lart/__init__.py
+++ b/plugins/Lart/__init__.py
@@ -58,4 +58,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Lart/config.py b/plugins/Lart/config.py
index c7b524712..0f775d1d1 100644
--- a/plugins/Lart/config.py
+++ b/plugins/Lart/config.py
@@ -48,4 +48,4 @@ conf.registerChannelValue(Lart, 'showIds',
     a lart when the lart is given."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Lart/plugin.py b/plugins/Lart/plugin.py
index df73c6c35..39cda1b7e 100644
--- a/plugins/Lart/plugin.py
+++ b/plugins/Lart/plugin.py
@@ -87,4 +87,4 @@ class Lart(plugins.ChannelIdDatabasePlugin):
 
 Class = Lart
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Lart/test.py b/plugins/Lart/test.py
index d452c68bb..ed2a57436 100644
--- a/plugins/Lart/test.py
+++ b/plugins/Lart/test.py
@@ -38,4 +38,4 @@ class LartTestCase(PluginTestCase):
     def testPraise(self):
         self.assertError('lart foo')  # no praises!
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Later/__init__.py b/plugins/Later/__init__.py
index 0d5e5482d..56497bd86 100644
--- a/plugins/Later/__init__.py
+++ b/plugins/Later/__init__.py
@@ -59,4 +59,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Later/config.py b/plugins/Later/config.py
index b816ea1ba..d3a9f337b 100644
--- a/plugins/Later/config.py
+++ b/plugins/Later/config.py
@@ -46,4 +46,4 @@ conf.registerGlobalValue(Later, 'private',
     registry.Boolean(True, """Determines whether users will be notified in the
     first place in which they're seen, or in private."""))
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Later/plugin.py b/plugins/Later/plugin.py
index f9dce22f5..4fb002a03 100644
--- a/plugins/Later/plugin.py
+++ b/plugins/Later/plugin.py
@@ -163,4 +163,4 @@ class Later(callbacks.Plugin):
 
 Class = Later
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Later/test.py b/plugins/Later/test.py
index 155b87d30..e9380eb2e 100644
--- a/plugins/Later/test.py
+++ b/plugins/Later/test.py
@@ -36,5 +36,5 @@ class LaterTestCase(PluginTestCase):
         self.assertNotError('later tell foo baz')
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/Limiter/__init__.py b/plugins/Limiter/__init__.py
index bf84bfdc2..913f4a0cd 100644
--- a/plugins/Limiter/__init__.py
+++ b/plugins/Limiter/__init__.py
@@ -57,4 +57,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Limiter/config.py b/plugins/Limiter/config.py
index b3987411a..d328da8df 100644
--- a/plugins/Limiter/config.py
+++ b/plugins/Limiter/config.py
@@ -54,4 +54,4 @@ conf.registerChannelValue(Limiter, 'maximumExcess',
     larger than supybot.plugins.Limiter.limit.minimumExcess."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Limiter/plugin.py b/plugins/Limiter/plugin.py
index c612432b3..8bb23836d 100644
--- a/plugins/Limiter/plugin.py
+++ b/plugins/Limiter/plugin.py
@@ -72,4 +72,4 @@ class Limiter(callbacks.Plugin):
 Class = Limiter
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Limiter/test.py b/plugins/Limiter/test.py
index 935093f8f..7dcdd2c36 100644
--- a/plugins/Limiter/test.py
+++ b/plugins/Limiter/test.py
@@ -53,4 +53,4 @@ class LimiterTestCase(ChannelPluginTestCase):
             conf.supybot.plugins.Limiter.maximumExcess.setValue(origMax)
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Math/__init__.py b/plugins/Math/__init__.py
index 78e1360cf..cd13b21a0 100644
--- a/plugins/Math/__init__.py
+++ b/plugins/Math/__init__.py
@@ -55,4 +55,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Math/config.py b/plugins/Math/config.py
index 70793f3ae..874767de3 100644
--- a/plugins/Math/config.py
+++ b/plugins/Math/config.py
@@ -45,4 +45,4 @@ Math = conf.registerPlugin('Math')
 #     registry.Boolean(False, """Help for someConfigVariableName."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Math/plugin.py b/plugins/Math/plugin.py
index 0044c2cfd..43f141c49 100644
--- a/plugins/Math/plugin.py
+++ b/plugins/Math/plugin.py
@@ -309,4 +309,4 @@ class Math(callbacks.Plugin):
 
 Class = Math
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Math/test.py b/plugins/Math/test.py
index 4ace47a37..88f655c05 100644
--- a/plugins/Math/test.py
+++ b/plugins/Math/test.py
@@ -185,5 +185,5 @@ class MathTestCase(PluginTestCase):
         self.assertResponse('calc abs(-2.0)', '2')
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/Misc/config.py b/plugins/Misc/config.py
index 05b42ba73..bb7bdb737 100644
--- a/plugins/Misc/config.py
+++ b/plugins/Misc/config.py
@@ -60,4 +60,4 @@ conf.registerChannelValue(Misc.last.nested,
     nick will be included in the output of last when it is part of a nested
     command"""))
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Misc/plugin.py b/plugins/Misc/plugin.py
index abbb769ca..6fb026046 100644
--- a/plugins/Misc/plugin.py
+++ b/plugins/Misc/plugin.py
@@ -382,4 +382,4 @@ class Misc(callbacks.Plugin):
 
 Class = Misc
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Misc/test.py b/plugins/Misc/test.py
index dcc1c95f8..a5cf46929 100644
--- a/plugins/Misc/test.py
+++ b/plugins/Misc/test.py
@@ -211,5 +211,5 @@ class MiscTestCase(ChannelPluginTestCase):
     def testAproposDoesntReturnNonCanonicalNames(self):
         self.assertNotRegexp('apropos exec', '_exec')
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/Network/__init__.py b/plugins/Network/__init__.py
index 2ac09cb8e..a39a9a0df 100644
--- a/plugins/Network/__init__.py
+++ b/plugins/Network/__init__.py
@@ -56,4 +56,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Network/config.py b/plugins/Network/config.py
index 5ca02671b..f18f11d18 100644
--- a/plugins/Network/config.py
+++ b/plugins/Network/config.py
@@ -45,4 +45,4 @@ Network = conf.registerPlugin('Network')
 #     registry.Boolean(False, """Help for someConfigVariableName."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Network/plugin.py b/plugins/Network/plugin.py
index c5638c69f..b60577976 100644
--- a/plugins/Network/plugin.py
+++ b/plugins/Network/plugin.py
@@ -276,4 +276,4 @@ class Network(callbacks.Plugin):
 
 Class = Network
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Network/test.py b/plugins/Network/test.py
index ac6c029be..04c6e38cc 100644
--- a/plugins/Network/test.py
+++ b/plugins/Network/test.py
@@ -39,5 +39,5 @@ class NetworkTestCase(PluginTestCase):
                             '1')
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/NickCapture/__init__.py b/plugins/NickCapture/__init__.py
index c29569bad..0e51de3a4 100644
--- a/plugins/NickCapture/__init__.py
+++ b/plugins/NickCapture/__init__.py
@@ -58,4 +58,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/NickCapture/config.py b/plugins/NickCapture/config.py
index 026d4d435..41d5ca527 100644
--- a/plugins/NickCapture/config.py
+++ b/plugins/NickCapture/config.py
@@ -49,4 +49,4 @@ conf.registerGlobalValue(NickCapture.ison, 'period',
     will check whether its nick ISON."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/NickCapture/plugin.py b/plugins/NickCapture/plugin.py
index 53dabc587..178f1dca1 100644
--- a/plugins/NickCapture/plugin.py
+++ b/plugins/NickCapture/plugin.py
@@ -93,4 +93,4 @@ class NickCapture(callbacks.Plugin):
 
 Class = NickCapture
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/NickCapture/test.py b/plugins/NickCapture/test.py
index 4b8f224c6..30f545563 100644
--- a/plugins/NickCapture/test.py
+++ b/plugins/NickCapture/test.py
@@ -33,5 +33,5 @@ class NickCaptureTestCase(PluginTestCase):
     plugins = ('NickCapture',)
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/Nickometer/__init__.py b/plugins/Nickometer/__init__.py
index a150bb60f..ce84cb3f2 100644
--- a/plugins/Nickometer/__init__.py
+++ b/plugins/Nickometer/__init__.py
@@ -78,4 +78,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Nickometer/config.py b/plugins/Nickometer/config.py
index 57bedb89d..6494468cb 100644
--- a/plugins/Nickometer/config.py
+++ b/plugins/Nickometer/config.py
@@ -45,4 +45,4 @@ Nickometer = conf.registerPlugin('Nickometer')
 #     registry.Boolean(False, """Help for someConfigVariableName."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Nickometer/plugin.py b/plugins/Nickometer/plugin.py
index 03a2a454b..90271aca9 100644
--- a/plugins/Nickometer/plugin.py
+++ b/plugins/Nickometer/plugin.py
@@ -230,4 +230,4 @@ class Nickometer(callbacks.Plugin):
 
 Class = Nickometer
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
\ No newline at end of file
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Nickometer/test.py b/plugins/Nickometer/test.py
index 5ef1febf3..af22688c0 100644
--- a/plugins/Nickometer/test.py
+++ b/plugins/Nickometer/test.py
@@ -35,4 +35,4 @@ class NickometerTestCase(PluginTestCase):
         self.assertNotError('nickometer')
         self.assertNotError('nickometer jemfinch')
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Note/__init__.py b/plugins/Note/__init__.py
index 01660f10f..d09a6f292 100644
--- a/plugins/Note/__init__.py
+++ b/plugins/Note/__init__.py
@@ -58,4 +58,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Note/config.py b/plugins/Note/config.py
index a603a7c41..c29e9274e 100644
--- a/plugins/Note/config.py
+++ b/plugins/Note/config.py
@@ -60,4 +60,4 @@ conf.registerGlobalValue(Note.notify, 'autoSend',
     notification message."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Note/plugin.py b/plugins/Note/plugin.py
index a651aab58..2b564f018 100644
--- a/plugins/Note/plugin.py
+++ b/plugins/Note/plugin.py
@@ -449,4 +449,4 @@ class Note(callbacks.Plugin):
 
 Class = Note
 
-# vim: shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim: shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Note/test.py b/plugins/Note/test.py
index 255399207..0cf7ab37c 100644
--- a/plugins/Note/test.py
+++ b/plugins/Note/test.py
@@ -87,4 +87,4 @@ class NoteTestCase(PluginTestCase):
         self.assertRegexp('note next', 'testing')
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Owner/config.py b/plugins/Owner/config.py
index 09d687a82..51941d15b 100644
--- a/plugins/Owner/config.py
+++ b/plugins/Owner/config.py
@@ -52,4 +52,4 @@ conf.registerGlobalValue(Owner, 'quitMsg',
 conf.registerGroup(conf.supybot.commands, 'renames', orderAlphabetically=True)
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Owner/plugin.py b/plugins/Owner/plugin.py
index 6da42b832..05070a479 100644
--- a/plugins/Owner/plugin.py
+++ b/plugins/Owner/plugin.py
@@ -587,5 +587,5 @@ class Owner(callbacks.Plugin):
 
 Class = Owner
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/Owner/test.py b/plugins/Owner/test.py
index 4dcf7135d..ccb96d79e 100644
--- a/plugins/Owner/test.py
+++ b/plugins/Owner/test.py
@@ -98,4 +98,4 @@ class OwnerTestCase(PluginTestCase):
         self.assertError('defaultplugin foobar owner')
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Plugin/__init__.py b/plugins/Plugin/__init__.py
index e33761905..556086118 100644
--- a/plugins/Plugin/__init__.py
+++ b/plugins/Plugin/__init__.py
@@ -63,4 +63,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Plugin/config.py b/plugins/Plugin/config.py
index 518b50cb5..1fd8b02ef 100644
--- a/plugins/Plugin/config.py
+++ b/plugins/Plugin/config.py
@@ -45,4 +45,4 @@ Plugin = conf.registerPlugin('Plugin')
 #     registry.Boolean(False, """Help for someConfigVariableName."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Plugin/plugin.py b/plugins/Plugin/plugin.py
index 994041420..070b2da0a 100644
--- a/plugins/Plugin/plugin.py
+++ b/plugins/Plugin/plugin.py
@@ -222,4 +222,4 @@ class Plugin(callbacks.Plugin):
 
 Class = Plugin
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Plugin/test.py b/plugins/Plugin/test.py
index 6f949f112..757b185d8 100644
--- a/plugins/Plugin/test.py
+++ b/plugins/Plugin/test.py
@@ -72,4 +72,4 @@ class PluginTestCase(PluginTestCase):
         self.assertNotError('contributors Plugin sKoRoBeUs')
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Praise/__init__.py b/plugins/Praise/__init__.py
index 6190a0a85..b08b144d4 100644
--- a/plugins/Praise/__init__.py
+++ b/plugins/Praise/__init__.py
@@ -58,4 +58,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Praise/config.py b/plugins/Praise/config.py
index 2757e7662..9359d535f 100644
--- a/plugins/Praise/config.py
+++ b/plugins/Praise/config.py
@@ -48,4 +48,4 @@ conf.registerChannelValue(Praise, 'showIds',
     a praise when the praise is given."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Praise/plugin.py b/plugins/Praise/plugin.py
index 094219eaa..302ac8af7 100644
--- a/plugins/Praise/plugin.py
+++ b/plugins/Praise/plugin.py
@@ -90,4 +90,4 @@ class Praise(plugins.ChannelIdDatabasePlugin):
 
 Class = Praise
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Praise/test.py b/plugins/Praise/test.py
index 36c5d03d9..b4f66526a 100644
--- a/plugins/Praise/test.py
+++ b/plugins/Praise/test.py
@@ -38,4 +38,4 @@ class PraiseTestCase(PluginTestCase):
     def testPraise(self):
         self.assertError('praise foo')  # no praises!
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Protector/__init__.py b/plugins/Protector/__init__.py
index a9fd5820e..ad0d6b86e 100644
--- a/plugins/Protector/__init__.py
+++ b/plugins/Protector/__init__.py
@@ -58,4 +58,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Protector/config.py b/plugins/Protector/config.py
index 93e671c91..1f948e831 100644
--- a/plugins/Protector/config.py
+++ b/plugins/Protector/config.py
@@ -56,4 +56,4 @@ conf.registerChannelValue(Protector, 'immune',
 
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Protector/plugin.py b/plugins/Protector/plugin.py
index e13a6b015..bb1de8e32 100644
--- a/plugins/Protector/plugin.py
+++ b/plugins/Protector/plugin.py
@@ -149,4 +149,4 @@ class Protector(callbacks.Plugin):
 
 Class = Protector
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Protector/test.py b/plugins/Protector/test.py
index 3b9748511..cd6041e3c 100644
--- a/plugins/Protector/test.py
+++ b/plugins/Protector/test.py
@@ -33,4 +33,4 @@ class ProtectorTestCase(PluginTestCase):
     plugins = ('Protector',)
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Quote/__init__.py b/plugins/Quote/__init__.py
index fa8a8800a..ef679668f 100644
--- a/plugins/Quote/__init__.py
+++ b/plugins/Quote/__init__.py
@@ -58,4 +58,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Quote/config.py b/plugins/Quote/config.py
index a284dd10f..293823871 100644
--- a/plugins/Quote/config.py
+++ b/plugins/Quote/config.py
@@ -45,4 +45,4 @@ Quote = conf.registerPlugin('Quote')
 #     registry.Boolean(False, """Help for someConfigVariableName."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Quote/plugin.py b/plugins/Quote/plugin.py
index 1c2ac921c..063d3d6b9 100644
--- a/plugins/Quote/plugin.py
+++ b/plugins/Quote/plugin.py
@@ -46,4 +46,4 @@ class Quote(plugins.ChannelIdDatabasePlugin):
 
 Class = Quote
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Quote/test.py b/plugins/Quote/test.py
index 23ee21a6f..39f8aca3c 100644
--- a/plugins/Quote/test.py
+++ b/plugins/Quote/test.py
@@ -33,4 +33,4 @@ class QuoteTestCase(PluginTestCase):
     plugins = ('Quote',)
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/QuoteGrabs/__init__.py b/plugins/QuoteGrabs/__init__.py
index 8b71dc527..4eefcc2c2 100644
--- a/plugins/QuoteGrabs/__init__.py
+++ b/plugins/QuoteGrabs/__init__.py
@@ -60,4 +60,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/QuoteGrabs/config.py b/plugins/QuoteGrabs/config.py
index c18a59c10..396a1a957 100644
--- a/plugins/QuoteGrabs/config.py
+++ b/plugins/QuoteGrabs/config.py
@@ -62,4 +62,4 @@ conf.registerChannelValue(conf.supybot.plugins.QuoteGrabs.randomGrabber,
     minimum number of characters in a message for it to be considered for
     random grabbing."""))
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/QuoteGrabs/plugin.py b/plugins/QuoteGrabs/plugin.py
index 51f3da836..0ecc80c92 100644
--- a/plugins/QuoteGrabs/plugin.py
+++ b/plugins/QuoteGrabs/plugin.py
@@ -332,4 +332,4 @@ class QuoteGrabs(callbacks.Plugin):
 
 Class = QuoteGrabs
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/QuoteGrabs/test.py b/plugins/QuoteGrabs/test.py
index 5f2a7b48c..a22e17f94 100644
--- a/plugins/QuoteGrabs/test.py
+++ b/plugins/QuoteGrabs/test.py
@@ -115,4 +115,4 @@ class QuoteGrabsNonChannelTestCase(QuoteGrabsTestCase):
     config = { 'databases.plugins.channelSpecific' : False }
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/RSS/__init__.py b/plugins/RSS/__init__.py
index 626f94b50..7a544ff3b 100644
--- a/plugins/RSS/__init__.py
+++ b/plugins/RSS/__init__.py
@@ -57,4 +57,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/RSS/config.py b/plugins/RSS/config.py
index b4074cbea..5d84789ef 100644
--- a/plugins/RSS/config.py
+++ b/plugins/RSS/config.py
@@ -79,4 +79,4 @@ conf.registerChannelValue(RSS.announce, 'showLinks',
 
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/RSS/plugin.py b/plugins/RSS/plugin.py
index 5d6874ad2..8d91bb665 100644
--- a/plugins/RSS/plugin.py
+++ b/plugins/RSS/plugin.py
@@ -395,4 +395,4 @@ class RSS(callbacks.Plugin):
 
 Class = RSS
 
-# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/RSS/test.py b/plugins/RSS/test.py
index 638596ef6..c4a1d14ff 100644
--- a/plugins/RSS/test.py
+++ b/plugins/RSS/test.py
@@ -75,5 +75,5 @@ class RSSTestCase(ChannelPluginTestCase):
             self.assertError('rss advogato')
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/Relay/__init__.py b/plugins/Relay/__init__.py
index 63e960f02..ddb3f41b4 100644
--- a/plugins/Relay/__init__.py
+++ b/plugins/Relay/__init__.py
@@ -57,4 +57,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Relay/config.py b/plugins/Relay/config.py
index ad1ea15d2..e5d822b43 100644
--- a/plugins/Relay/config.py
+++ b/plugins/Relay/config.py
@@ -86,4 +86,4 @@ conf.registerChannelValue(Relay, 'noticeNonPrivmsgs',
     nicks, quits, modes, etc.)"""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Relay/plugin.py b/plugins/Relay/plugin.py
index 173fc3b39..83c8806cc 100644
--- a/plugins/Relay/plugin.py
+++ b/plugins/Relay/plugin.py
@@ -523,4 +523,4 @@ class Relay(callbacks.Plugin):
 
 Class = Relay
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Relay/test.py b/plugins/Relay/test.py
index 0879a4f4c..2faa6092a 100644
--- a/plugins/Relay/test.py
+++ b/plugins/Relay/test.py
@@ -33,5 +33,5 @@ class RelayTestCase(PluginTestCase):
     plugins = ('Relay',)
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/Reply/__init__.py b/plugins/Reply/__init__.py
index 4e00fd4a0..74993678f 100644
--- a/plugins/Reply/__init__.py
+++ b/plugins/Reply/__init__.py
@@ -59,4 +59,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Reply/config.py b/plugins/Reply/config.py
index 3deb659a8..1b99dd523 100644
--- a/plugins/Reply/config.py
+++ b/plugins/Reply/config.py
@@ -45,4 +45,4 @@ Reply = conf.registerPlugin('Reply')
 #     registry.Boolean(False, """Help for someConfigVariableName."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Reply/plugin.py b/plugins/Reply/plugin.py
index 7d1dd3799..9ee9d6893 100644
--- a/plugins/Reply/plugin.py
+++ b/plugins/Reply/plugin.py
@@ -77,4 +77,4 @@ class Reply(callbacks.Plugin):
 Class = Reply
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Reply/test.py b/plugins/Reply/test.py
index 2ce111cc3..1c51e0eac 100644
--- a/plugins/Reply/test.py
+++ b/plugins/Reply/test.py
@@ -56,4 +56,4 @@ class ReplyNonChannelTestCase(PluginTestCase):
         m = self.assertAction('action foo', 'foo')
         self.failIf(m.args[0] == self.irc.nick)
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Scheduler/__init__.py b/plugins/Scheduler/__init__.py
index 95f863ec2..64d5978be 100644
--- a/plugins/Scheduler/__init__.py
+++ b/plugins/Scheduler/__init__.py
@@ -58,4 +58,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Scheduler/config.py b/plugins/Scheduler/config.py
index 4fb964c72..5230605c0 100644
--- a/plugins/Scheduler/config.py
+++ b/plugins/Scheduler/config.py
@@ -45,4 +45,4 @@ Scheduler = conf.registerPlugin('Scheduler')
 #     registry.Boolean(False, """Help for someConfigVariableName."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Scheduler/plugin.py b/plugins/Scheduler/plugin.py
index 1d6187b7f..25c2e063f 100644
--- a/plugins/Scheduler/plugin.py
+++ b/plugins/Scheduler/plugin.py
@@ -125,4 +125,4 @@ class Scheduler(callbacks.Plugin):
 
 Class = Scheduler
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Scheduler/test.py b/plugins/Scheduler/test.py
index f02a19e0a..d46bb62bd 100644
--- a/plugins/Scheduler/test.py
+++ b/plugins/Scheduler/test.py
@@ -81,5 +81,5 @@ class SchedulerTestCase(ChannelPluginTestCase):
         self.assertError('scheduler repeat foo 5 "echo another foo fails"')
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/Seen/__init__.py b/plugins/Seen/__init__.py
index 57c814d11..1847a63f7 100644
--- a/plugins/Seen/__init__.py
+++ b/plugins/Seen/__init__.py
@@ -57,4 +57,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Seen/config.py b/plugins/Seen/config.py
index f02065b06..458c4dc04 100644
--- a/plugins/Seen/config.py
+++ b/plugins/Seen/config.py
@@ -45,4 +45,4 @@ Seen = conf.registerPlugin('Seen')
 #     registry.Boolean(False, """Help for someConfigVariableName."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Seen/plugin.py b/plugins/Seen/plugin.py
index fbf38fc11..850932758 100644
--- a/plugins/Seen/plugin.py
+++ b/plugins/Seen/plugin.py
@@ -293,4 +293,4 @@ class Seen(callbacks.Plugin):
 
 Class = Seen
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Seen/test.py b/plugins/Seen/test.py
index df020bb7a..82f6fbff6 100644
--- a/plugins/Seen/test.py
+++ b/plugins/Seen/test.py
@@ -73,5 +73,5 @@ class ChannelDBTestCase(ChannelPluginTestCase):
         self.assertNotRegexp('seen user alsdkfjalsdfkj', 'KeyError')
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/Services/__init__.py b/plugins/Services/__init__.py
index 8457ff8d7..016c15da5 100644
--- a/plugins/Services/__init__.py
+++ b/plugins/Services/__init__.py
@@ -57,4 +57,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Services/config.py b/plugins/Services/config.py
index 5185f031f..b50a86be9 100644
--- a/plugins/Services/config.py
+++ b/plugins/Services/config.py
@@ -99,4 +99,4 @@ conf.registerChannelValue(Services.ChanServ, 'voice',
     registry.Boolean(False, """Determines whether the bot will request to get
     voiced by the ChanServ when it joins the channel."""))
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Services/plugin.py b/plugins/Services/plugin.py
index 38b5ad5d6..5265793ae 100644
--- a/plugins/Services/plugin.py
+++ b/plugins/Services/plugin.py
@@ -488,4 +488,4 @@ class Services(callbacks.Plugin):
 
 Class = Services
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Services/test.py b/plugins/Services/test.py
index 474782390..b920fc1a5 100644
--- a/plugins/Services/test.py
+++ b/plugins/Services/test.py
@@ -49,5 +49,5 @@ class ServicesTestCase(PluginTestCase):
         self.failUnless(m.args[1].lower() == 'identify biff')
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/ShrinkUrl/__init__.py b/plugins/ShrinkUrl/__init__.py
index a9ad70a18..528507a29 100644
--- a/plugins/ShrinkUrl/__init__.py
+++ b/plugins/ShrinkUrl/__init__.py
@@ -55,4 +55,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/ShrinkUrl/config.py b/plugins/ShrinkUrl/config.py
index e94f77922..ef59dc7cb 100644
--- a/plugins/ShrinkUrl/config.py
+++ b/plugins/ShrinkUrl/config.py
@@ -68,4 +68,4 @@ conf.registerGlobalValue(ShrinkUrl, 'bold',
     portions of its replies."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/ShrinkUrl/plugin.py b/plugins/ShrinkUrl/plugin.py
index 3f0c2c97f..12258f636 100644
--- a/plugins/ShrinkUrl/plugin.py
+++ b/plugins/ShrinkUrl/plugin.py
@@ -206,4 +206,4 @@ class ShrinkUrl(callbacks.PluginRegexp):
 
 Class = ShrinkUrl
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/ShrinkUrl/test.py b/plugins/ShrinkUrl/test.py
index 814797861..a79d0de8c 100644
--- a/plugins/ShrinkUrl/test.py
+++ b/plugins/ShrinkUrl/test.py
@@ -116,5 +116,5 @@ class ShrinkUrlTestCase(ChannelPluginTestCase):
 
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/Status/__init__.py b/plugins/Status/__init__.py
index 267c785b6..24e0a72c9 100644
--- a/plugins/Status/__init__.py
+++ b/plugins/Status/__init__.py
@@ -56,4 +56,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Status/config.py b/plugins/Status/config.py
index 0e48e295d..3d6e5870e 100644
--- a/plugins/Status/config.py
+++ b/plugins/Status/config.py
@@ -50,4 +50,4 @@ conf.registerChannelValue(Status.cpu, 'memory',
     registry.Boolean(True, """Determines whether the cpu command will report
     the amount of memory being used by the bot."""))
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Status/plugin.py b/plugins/Status/plugin.py
index 354fe9c77..a0c18a25d 100644
--- a/plugins/Status/plugin.py
+++ b/plugins/Status/plugin.py
@@ -208,4 +208,4 @@ class Status(callbacks.Plugin):
 
 Class = Status
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Status/test.py b/plugins/Status/test.py
index 77893b55e..8af0b7cd6 100644
--- a/plugins/Status/test.py
+++ b/plugins/Status/test.py
@@ -72,5 +72,5 @@ class StatusTestCase(PluginTestCase):
         self.assertNotError('threads')
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/String/__init__.py b/plugins/String/__init__.py
index eb65a20a4..fab0c8acb 100644
--- a/plugins/String/__init__.py
+++ b/plugins/String/__init__.py
@@ -57,4 +57,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/String/config.py b/plugins/String/config.py
index 1328ccb81..3a25a7d90 100644
--- a/plugins/String/config.py
+++ b/plugins/String/config.py
@@ -51,4 +51,4 @@ conf.registerGlobalValue(String.levenshtein, 'max',
     this variable, to limit the size of arguments passed to the levenshtein
     command."""))
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/String/plugin.py b/plugins/String/plugin.py
index 98da36863..9a7d6e129 100644
--- a/plugins/String/plugin.py
+++ b/plugins/String/plugin.py
@@ -175,4 +175,4 @@ class String(callbacks.Plugin):
 Class = String
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/String/test.py b/plugins/String/test.py
index e31dbb201..0d1de82a9 100644
--- a/plugins/String/test.py
+++ b/plugins/String/test.py
@@ -138,4 +138,4 @@ class StringTestCase(PluginTestCase):
             self.assertResponse('xor %s [xor %s %s]' % (s9, s9, data), data)
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Time/__init__.py b/plugins/Time/__init__.py
index 3210d358b..48755bdf4 100644
--- a/plugins/Time/__init__.py
+++ b/plugins/Time/__init__.py
@@ -57,4 +57,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Time/config.py b/plugins/Time/config.py
index 897f071f6..a026ce642 100644
--- a/plugins/Time/config.py
+++ b/plugins/Time/config.py
@@ -46,4 +46,4 @@ conf.registerChannelValue(Time, 'format',
     the empty string, the timestamp will not be shown."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Time/plugin.py b/plugins/Time/plugin.py
index 431cb1ac7..81037d95f 100644
--- a/plugins/Time/plugin.py
+++ b/plugins/Time/plugin.py
@@ -155,4 +155,4 @@ class Time(callbacks.Plugin):
 
 Class = Time
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Time/test.py b/plugins/Time/test.py
index bd24f9b42..0977eae8a 100644
--- a/plugins/Time/test.py
+++ b/plugins/Time/test.py
@@ -52,5 +52,5 @@ class TimeTestCase(PluginTestCase):
         self.assertNotError('time %Y')
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/Todo/__init__.py b/plugins/Todo/__init__.py
index 8af066349..a714bddae 100644
--- a/plugins/Todo/__init__.py
+++ b/plugins/Todo/__init__.py
@@ -58,4 +58,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Todo/config.py b/plugins/Todo/config.py
index 896e69d5f..b58ba493c 100644
--- a/plugins/Todo/config.py
+++ b/plugins/Todo/config.py
@@ -45,4 +45,4 @@ Todo = conf.registerPlugin('Todo')
 #     registry.Boolean(False, """Help for someConfigVariableName."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Todo/plugin.py b/plugins/Todo/plugin.py
index 3b088ec76..b3a277992 100644
--- a/plugins/Todo/plugin.py
+++ b/plugins/Todo/plugin.py
@@ -262,4 +262,4 @@ class Todo(callbacks.Plugin):
 Class = Todo
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Todo/test.py b/plugins/Todo/test.py
index fe108a039..9a3dac506 100644
--- a/plugins/Todo/test.py
+++ b/plugins/Todo/test.py
@@ -132,4 +132,4 @@ class TodoTestCase(PluginTestCase):
         self.assertRegexp('todo 2', 'Inactive')
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Topic/__init__.py b/plugins/Topic/__init__.py
index 9cda5f98b..d271950d1 100644
--- a/plugins/Topic/__init__.py
+++ b/plugins/Topic/__init__.py
@@ -57,4 +57,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Topic/config.py b/plugins/Topic/config.py
index 315eda70b..ac9cd3373 100644
--- a/plugins/Topic/config.py
+++ b/plugins/Topic/config.py
@@ -70,4 +70,4 @@ conf.registerChannelValue(Topic.undo, 'max',
 
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Topic/plugin.py b/plugins/Topic/plugin.py
index 128022de7..9909cd4ff 100644
--- a/plugins/Topic/plugin.py
+++ b/plugins/Topic/plugin.py
@@ -443,4 +443,4 @@ class Topic(callbacks.Plugin):
 Class = Topic
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Topic/test.py b/plugins/Topic/test.py
index e1a1b64b5..cefbc98f0 100644
--- a/plugins/Topic/test.py
+++ b/plugins/Topic/test.py
@@ -234,5 +234,5 @@ class TopicTestCase(ChannelPluginTestCase):
             self.irc.state.supported.pop('TOPICLEN', None)
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/URL/__init__.py b/plugins/URL/__init__.py
index 4250c258e..d2e8d84c5 100644
--- a/plugins/URL/__init__.py
+++ b/plugins/URL/__init__.py
@@ -59,4 +59,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/URL/config.py b/plugins/URL/config.py
index 5c81d6087..ecef031fb 100644
--- a/plugins/URL/config.py
+++ b/plugins/URL/config.py
@@ -46,4 +46,4 @@ conf.registerChannelValue(URL, 'nonSnarfingRegexp',
     exclude from being snarfed."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/URL/plugin.py b/plugins/URL/plugin.py
index 805aa5191..b59dccd17 100644
--- a/plugins/URL/plugin.py
+++ b/plugins/URL/plugin.py
@@ -147,4 +147,4 @@ class URL(callbacks.Plugin):
 
 Class = URL
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/URL/test.py b/plugins/URL/test.py
index d7eed3694..3585fa0c3 100644
--- a/plugins/URL/test.py
+++ b/plugins/URL/test.py
@@ -84,5 +84,5 @@ class URLTestCase(ChannelPluginTestCase):
         self.irc.feedMsg(ircmsgs.action(self.channel, urls[1]))
         self.assertNotRegexp('url last', '\\x01')
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/User/config.py b/plugins/User/config.py
index 40752f5be..70d512b2e 100644
--- a/plugins/User/config.py
+++ b/plugins/User/config.py
@@ -45,4 +45,4 @@ User = conf.registerPlugin('User')
 # conf.registerGlobalValue(User, 'someConfigVariableName',
 #     registry.Boolean(False, """Help for someConfigVariableName."""))
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/User/plugin.py b/plugins/User/plugin.py
index c6b117935..9e04261d8 100644
--- a/plugins/User/plugin.py
+++ b/plugins/User/plugin.py
@@ -430,5 +430,5 @@ class User(callbacks.Plugin):
 
 Class = User
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/User/test.py b/plugins/User/test.py
index a1fa6f020..abfe757ab 100644
--- a/plugins/User/test.py
+++ b/plugins/User/test.py
@@ -107,5 +107,5 @@ class UserTestCase(PluginTestCase):
         self.assertNotError('load Seen')
         self.assertResponse('user list', 'Foo')
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/plugins/Utilities/__init__.py b/plugins/Utilities/__init__.py
index ef8b4c753..0263ce3d1 100644
--- a/plugins/Utilities/__init__.py
+++ b/plugins/Utilities/__init__.py
@@ -55,4 +55,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Utilities/config.py b/plugins/Utilities/config.py
index 826fed294..520a42787 100644
--- a/plugins/Utilities/config.py
+++ b/plugins/Utilities/config.py
@@ -45,4 +45,4 @@ Utilities = conf.registerPlugin('Utilities')
 #     registry.Boolean(False, """Help for someConfigVariableName."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Utilities/plugin.py b/plugins/Utilities/plugin.py
index c1c31985a..d6d0b8a7b 100644
--- a/plugins/Utilities/plugin.py
+++ b/plugins/Utilities/plugin.py
@@ -109,4 +109,4 @@ class Utilities(callbacks.Plugin):
 
 Class = Utilities
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Utilities/test.py b/plugins/Utilities/test.py
index 395cd7a60..26413d048 100644
--- a/plugins/Utilities/test.py
+++ b/plugins/Utilities/test.py
@@ -59,4 +59,4 @@ class UtilitiesTestCase(PluginTestCase):
     def testShuffle(self):
         self.assertResponse('shuffle a', 'a')
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Web/__init__.py b/plugins/Web/__init__.py
index e2c2875e5..7a805a362 100644
--- a/plugins/Web/__init__.py
+++ b/plugins/Web/__init__.py
@@ -55,4 +55,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Web/config.py b/plugins/Web/config.py
index 93782e434..892f6b2d3 100644
--- a/plugins/Web/config.py
+++ b/plugins/Web/config.py
@@ -58,4 +58,4 @@ conf.registerGlobalValue(Web.fetch, 'maximum',
     registry.NonNegativeInteger(0, """Determines the maximum number of
     bytes the bot will download via the 'fetch' command in this plugin."""))
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Web/plugin.py b/plugins/Web/plugin.py
index 11fd12644..6a9a6798c 100644
--- a/plugins/Web/plugin.py
+++ b/plugins/Web/plugin.py
@@ -202,4 +202,4 @@ class Web(callbacks.PluginRegexp):
 
 Class = Web
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/Web/test.py b/plugins/Web/test.py
index 38161afc3..be198e844 100644
--- a/plugins/Web/test.py
+++ b/plugins/Web/test.py
@@ -108,4 +108,4 @@ class WebTestCase(PluginTestCase):
             conf.supybot.plugins.Web.nonSnarfingRegexp.set('')
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/plugins/__init__.py b/plugins/__init__.py
index ab896915e..0203a57b5 100644
--- a/plugins/__init__.py
+++ b/plugins/__init__.py
@@ -596,4 +596,4 @@ class PeriodicFileDownloader(object):
 
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/sandbox/Debug/__init__.py b/sandbox/Debug/__init__.py
index be259a5c7..1db92dd90 100644
--- a/sandbox/Debug/__init__.py
+++ b/sandbox/Debug/__init__.py
@@ -54,4 +54,4 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/sandbox/Debug/config.py b/sandbox/Debug/config.py
index a507be31f..4a41a2475 100644
--- a/sandbox/Debug/config.py
+++ b/sandbox/Debug/config.py
@@ -45,4 +45,4 @@ Debug = conf.registerPlugin('Debug')
 #     registry.Boolean(False, """Help for someConfigVariableName."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/sandbox/Debug/plugin.py b/sandbox/Debug/plugin.py
index 2418c166b..f5bf5936b 100644
--- a/sandbox/Debug/plugin.py
+++ b/sandbox/Debug/plugin.py
@@ -200,4 +200,4 @@ class Debug(callbacks.Privmsg):
 
 Class = Debug
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/sandbox/Debug/test.py b/sandbox/Debug/test.py
index 06e8da087..2dfb20f97 100644
--- a/sandbox/Debug/test.py
+++ b/sandbox/Debug/test.py
@@ -33,4 +33,4 @@ class DebugTestCase(PluginTestCase):
     plugins = ('Debug',)
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/scripts/supybot b/scripts/supybot
index 3b7396f70..0c398a1d7 100644
--- a/scripts/supybot
+++ b/scripts/supybot
@@ -350,4 +350,4 @@ if __name__ == '__main__':
         main()
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/scripts/supybot-botchk b/scripts/supybot-botchk
index 5ebf257af..faeb1bd12 100644
--- a/scripts/supybot-botchk
+++ b/scripts/supybot-botchk
@@ -130,4 +130,4 @@ if __name__ == '__main__':
     else:
         sys.exit(0)
         
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/scripts/supybot-newplugin b/scripts/supybot-newplugin
index 7bf147383..b3c085bd8 100644
--- a/scripts/supybot-newplugin
+++ b/scripts/supybot-newplugin
@@ -100,7 +100,7 @@ class %s(callbacks.Plugin):
 Class = %s
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 '''.lstrip() # This removes the newlines that precede and follow the text.
 
 configTemplate = '''
@@ -124,7 +124,7 @@ def configure(advanced):
 #     registry.Boolean(False, """Help for someConfigVariableName."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 '''.lstrip()
 
 
@@ -166,7 +166,7 @@ Class = plugin.Class
 configure = config.configure
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 '''.lstrip()
 
 testTemplate = '''
@@ -178,7 +178,7 @@ class %sTestCase(PluginTestCase):
     plugins = (%r,)
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 '''.lstrip()
 
 readmeTemplate = '''
@@ -273,4 +273,4 @@ if __name__ == '__main__':
         finished.  Obviously, nothing was written, but just run this script
         again whenever you want to generate a template for a plugin.""")
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/scripts/supybot-plugin-package b/scripts/supybot-plugin-package
index 90f5be0aa..d7ee069fd 100644
--- a/scripts/supybot-plugin-package
+++ b/scripts/supybot-plugin-package
@@ -51,4 +51,4 @@ if __name__ == '__main__':
         tf.add(dirname, basename, True)
         tf.close()
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/scripts/supybot-test b/scripts/supybot-test
index 16cf43a56..3859231cb 100644
--- a/scripts/supybot-test
+++ b/scripts/supybot-test
@@ -202,4 +202,4 @@ if __name__ == '__main__':
     if hasattr(unittest, 'asserts'):
         print 'Total asserts: %s' % unittest.asserts
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/setup.py b/setup.py
index e905dbac4..3f6b1192f 100644
--- a/setup.py
+++ b/setup.py
@@ -197,4 +197,4 @@ setup(
     )
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/__init__.py b/src/__init__.py
index 98a21cd2e..4bf6a6811 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -64,4 +64,4 @@ class authors(object): # This is basically a bag.
         except AttributeError:
             return self.unknown
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/ansi.py b/src/ansi.py
index 4b2b2fcb1..a555fc9e9 100644
--- a/src/ansi.py
+++ b/src/ansi.py
@@ -108,4 +108,4 @@ WHITEBG = '\033[47m'
 #def clrtoeol():
 #  'Clears screen to end of line'
 #  print '\033[K'
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/callbacks.py b/src/callbacks.py
index 2293c5af9..e3f635ab4 100644
--- a/src/callbacks.py
+++ b/src/callbacks.py
@@ -1291,4 +1291,4 @@ class PluginRegexp(Plugin):
 PrivmsgCommandAndRegexp = PluginRegexp
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/cdb.py b/src/cdb.py
index 830fadd56..7ab193163 100644
--- a/src/cdb.py
+++ b/src/cdb.py
@@ -467,4 +467,4 @@ if __name__ == '__main__':
             make(sys.argv[1])
         else:
             make(sys.argv[1], sys.argv[2])
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/commands.py b/src/commands.py
index 78d821bb7..309a5e4f9 100644
--- a/src/commands.py
+++ b/src/commands.py
@@ -913,4 +913,4 @@ __all__ = [
 ## if world.testing:
 ##     __all__.append('Spec')
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/conf.py b/src/conf.py
index 7c1dda0ac..fe26dbb34 100644
--- a/src/conf.py
+++ b/src/conf.py
@@ -1005,4 +1005,4 @@ registerGlobalValue(supybot.debug, 'flushVeryOften',
     what's breaking or when, but think that it might be logged."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/dbi.py b/src/dbi.py
index ea109710e..7bd08a5c5 100644
--- a/src/dbi.py
+++ b/src/dbi.py
@@ -430,4 +430,4 @@ class Record(object):
             setattr(self, name, self.defaults[name])
 
     
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/drivers/Socket.py b/src/drivers/Socket.py
index 7e6f8062b..852c31757 100644
--- a/src/drivers/Socket.py
+++ b/src/drivers/Socket.py
@@ -215,5 +215,5 @@ class SocketDriver(drivers.IrcDriver, drivers.ServersMixin):
 
 Driver = SocketDriver
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/src/drivers/Twisted.py b/src/drivers/Twisted.py
index 0891dc8de..f984906b5 100644
--- a/src/drivers/Twisted.py
+++ b/src/drivers/Twisted.py
@@ -158,4 +158,4 @@ try:
     ignore(poller)
 except NameError:
     poller = TwistedRunnerDriver()
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/drivers/__init__.py b/src/drivers/__init__.py
index 25c0e99cb..09ca4ec97 100644
--- a/src/drivers/__init__.py
+++ b/src/drivers/__init__.py
@@ -211,4 +211,4 @@ def parseMsg(s):
     else:
         return None
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/dynamicScope.py b/src/dynamicScope.py
index 6013d0188..2a8a80af6 100644
--- a/src/dynamicScope.py
+++ b/src/dynamicScope.py
@@ -49,4 +49,4 @@ class DynamicScope(object):
 
 __builtins__['dynamic'] = DynamicScope()
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/ircdb.py b/src/ircdb.py
index 263fee500..d6f8f194a 100644
--- a/src/ircdb.py
+++ b/src/ircdb.py
@@ -1093,4 +1093,4 @@ conf.registerGlobalValue(conf.supybot.capabilities, 'default',
     have the capability for whatever command he wishes to run."""))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/irclib.py b/src/irclib.py
index 1b61f9eb4..19cea46ae 100644
--- a/src/irclib.py
+++ b/src/irclib.py
@@ -987,4 +987,4 @@ class Irc(IrcCommandDispatcher):
         return '<irclib.Irc object for %s>' % self.network
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/ircmsgs.py b/src/ircmsgs.py
index 9b69f7704..d55ec410e 100644
--- a/src/ircmsgs.py
+++ b/src/ircmsgs.py
@@ -774,4 +774,4 @@ def ison(nick, prefix='', msg=None):
 def error(s, msg=None):
     return IrcMsg(command='ERROR', args=(s,), msg=msg)
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/ircutils.py b/src/ircutils.py
index ce722c3fc..e5c1bec58 100644
--- a/src/ircutils.py
+++ b/src/ircutils.py
@@ -662,4 +662,4 @@ def standardSubstitute(irc, msg, text, env=None):
 if __name__ == '__main__':
     import sys, doctest
     doctest.testmod(sys.modules['__main__'])
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/log.py b/src/log.py
index 3d63d6069..6d1823b0b 100644
--- a/src/log.py
+++ b/src/log.py
@@ -387,5 +387,5 @@ if not conf.daemonized:
     _logger.addHandler(_stdoutHandler)
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/src/plugin.py b/src/plugin.py
index 5c35d7daa..b9428aad1 100644
--- a/src/plugin.py
+++ b/src/plugin.py
@@ -118,4 +118,4 @@ def loadPluginClass(irc, module, register=None):
     irc.addCallback(cb)
     return cb
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/questions.py b/src/questions.py
index ab73bba4f..57b94db77 100644
--- a/src/questions.py
+++ b/src/questions.py
@@ -137,4 +137,4 @@ def getpass(prompt='Enter password: ', secondPrompt='Re-enter password: '):
     return password
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/registry.py b/src/registry.py
index ab4a57e39..569b3924f 100644
--- a/src/registry.py
+++ b/src/registry.py
@@ -615,5 +615,5 @@ class CommaSeparatedListOfStrings(SeparatedListOf):
     joiner = ', '.join
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/src/schedule.py b/src/schedule.py
index db6a83152..766d6d2eb 100644
--- a/src/schedule.py
+++ b/src/schedule.py
@@ -144,4 +144,4 @@ removePeriodicEvent = removeEvent
 run = schedule.run
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/test.py b/src/test.py
index f6ea037a9..6218d4cc0 100644
--- a/src/test.py
+++ b/src/test.py
@@ -443,5 +443,5 @@ class ChannelPluginTestCase(PluginTestCase):
         self.irc.feedMsg(ircmsgs.privmsg(to, query, prefix=frm))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/src/unpreserve.py b/src/unpreserve.py
index 7bbc0e082..374699f75 100644
--- a/src/unpreserve.py
+++ b/src/unpreserve.py
@@ -71,5 +71,5 @@ class Reader(object):
             self.creator.finish()
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/src/utils/__init__.py b/src/utils/__init__.py
index e09b4bcfb..c11a9c361 100644
--- a/src/utils/__init__.py
+++ b/src/utils/__init__.py
@@ -103,4 +103,4 @@ import str
 import file
 import iter
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/utils/file.py b/src/utils/file.py
index 5fd1e71e5..fb89153da 100644
--- a/src/utils/file.py
+++ b/src/utils/file.py
@@ -151,4 +151,4 @@ class AtomicFile(file):
         # no logging facility in utils.  I've got some ideas for this, though.
         self.rollback()
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/utils/gen.py b/src/utils/gen.py
index 63b01eb11..52b8bf2cd 100644
--- a/src/utils/gen.py
+++ b/src/utils/gen.py
@@ -323,4 +323,4 @@ def callTracer(fd=None, basename=True):
             print >>fd, '%s: %s(%s)' % (filename, funcname, lineno)
     return tracer
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/utils/iter.py b/src/utils/iter.py
index 5e47c91c0..3102a9a37 100644
--- a/src/utils/iter.py
+++ b/src/utils/iter.py
@@ -158,4 +158,4 @@ def startswith(long, short):
     except StopIteration:
         return True
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/utils/net.py b/src/utils/net.py
index 5cc2276f1..96f2f7ec5 100644
--- a/src/utils/net.py
+++ b/src/utils/net.py
@@ -92,4 +92,4 @@ def isIPV6(s):
             return bruteIsIPV6(s)
         return False
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/utils/seq.py b/src/utils/seq.py
index 18cecab1b..eee74669d 100644
--- a/src/utils/seq.py
+++ b/src/utils/seq.py
@@ -41,5 +41,5 @@ def mapinto(f, L):
 
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/src/utils/str.py b/src/utils/str.py
index 736652656..dca7720e8 100644
--- a/src/utils/str.py
+++ b/src/utils/str.py
@@ -413,4 +413,4 @@ def format(s, *args, **kwargs):
     except IndexError:
         raise ValueError, 'Extra format chars in format spec: %r' % s
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/utils/structures.py b/src/utils/structures.py
index ba30bd58b..060affa33 100644
--- a/src/utils/structures.py
+++ b/src/utils/structures.py
@@ -418,4 +418,4 @@ class MultiSet(object):
 
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/src/utils/web.py b/src/utils/web.py
index 306c3410a..00d2ea066 100644
--- a/src/utils/web.py
+++ b/src/utils/web.py
@@ -161,5 +161,5 @@ def mungeEmail(s):
     s = s.replace('.', ' DOT ')
     return s
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/src/world.py b/src/world.py
index a5e6224de..3ccaad5d8 100644
--- a/src/world.py
+++ b/src/world.py
@@ -199,4 +199,4 @@ profiling = False
 documenting = False
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/test/__init__.py b/test/__init__.py
index 74f15fe8e..6cb5bb3ed 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -30,4 +30,4 @@
 # We're just masquerading as a plugin :)
 import test
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/test/test.py b/test/test.py
index 77ef79714..9afce5dae 100644
--- a/test/test.py
+++ b/test/test.py
@@ -49,4 +49,4 @@ for filename in filenames:
 module = None
     
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/test/test_callbacks.py b/test/test_callbacks.py
index 141e67ede..6a0c22c66 100644
--- a/test/test_callbacks.py
+++ b/test/test_callbacks.py
@@ -615,4 +615,4 @@ class WithPrivateNoticeTestCase(ChannelPluginTestCase):
 
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/test/test_commands.py b/test/test_commands.py
index 952d785b2..61344645e 100644
--- a/test/test_commands.py
+++ b/test/test_commands.py
@@ -153,5 +153,5 @@ class FirstTestCase(CommandsTestCase):
     def testRepr(self):
         self.failUnless(repr(first('int')))
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/test/test_dynamicScope.py b/test/test_dynamicScope.py
index f7fdb87d4..f90fd7cb8 100644
--- a/test/test_dynamicScope.py
+++ b/test/test_dynamicScope.py
@@ -55,4 +55,4 @@ class TestDynamic(SupyTestCase):
             self.assertEqual(foo, 'bar')
         f()
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/test/test_format.py b/test/test_format.py
index a63c4fdee..b6f8313b1 100644
--- a/test/test_format.py
+++ b/test/test_format.py
@@ -37,4 +37,4 @@ class FormatTestCase(SupyTestCase):
         self.assertEqual(format('%.2f', 0.12345), '0.12')
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/test/test_ircdb.py b/test/test_ircdb.py
index 25560387d..567b3672b 100644
--- a/test/test_ircdb.py
+++ b/test/test_ircdb.py
@@ -560,5 +560,5 @@ class CheckCapabilityTestCase(IrcdbTestCase):
             conf.supybot.capabilities.default.set(str(originalConfDefaultAllow))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/test/test_irclib.py b/test/test_irclib.py
index 7c5fb8e68..3efe04167 100644
--- a/test/test_irclib.py
+++ b/test/test_irclib.py
@@ -490,5 +490,5 @@ class IrcCallbackTestCase(SupyTestCase):
             conf.supybot.user.setValue(originalUser)
             conf.supybot.networks.test.password.setValue(originalPassword)
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/test/test_ircmsgs.py b/test/test_ircmsgs.py
index df4fb4d9f..b0965a33e 100644
--- a/test/test_ircmsgs.py
+++ b/test/test_ircmsgs.py
@@ -254,4 +254,4 @@ class FunctionsTestCase(SupyTestCase):
         self.failIf(ircmsgs.isSplit(m))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/test/test_ircutils.py b/test/test_ircutils.py
index 5bdec62b6..ed7e60f3b 100644
--- a/test/test_ircutils.py
+++ b/test/test_ircutils.py
@@ -355,5 +355,5 @@ class IrcStringTestCase(SupyTestCase):
         self.failIf(s1 != s2)
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/test/test_plugin.py b/test/test_plugin.py
index abe837bc5..0fe596ced 100644
--- a/test/test_plugin.py
+++ b/test/test_plugin.py
@@ -40,4 +40,4 @@ class FunctionsTestCase(SupyTestCase):
         #self.failUnless(plugin.loadPluginModule('owner'))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/test/test_registry.py b/test/test_registry.py
index 9cc7d5ee6..102cb55e7 100644
--- a/test/test_registry.py
+++ b/test/test_registry.py
@@ -168,4 +168,4 @@ class ValuesTestCase(SupyTestCase):
                           v.setValue, re.compile(r'foo'))
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
diff --git a/test/test_schedule.py b/test/test_schedule.py
index 0849eba87..d1f4648b2 100644
--- a/test/test_schedule.py
+++ b/test/test_schedule.py
@@ -74,5 +74,5 @@ class TestSchedule(SupyTestCase):
         self.assertEqual(i[0], 1)
 
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
diff --git a/test/test_utils.py b/test/test_utils.py
index 4c1661748..8d41d9766 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -1104,5 +1104,5 @@ class TestTimeoutQueue(SupyTestCase):
         q.reset()
         self.failIf(1 in q)
 
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79: