diff --git a/others/SOAP.py b/others/SOAP.py
index 4b2f02328..7fd638047 100644
--- a/others/SOAP.py
+++ b/others/SOAP.py
@@ -3970,3 +3970,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:
diff --git a/others/amazon.py b/others/amazon.py
index 42bc808ba..d21bef9f5 100644
--- a/others/amazon.py
+++ b/others/amazon.py
@@ -272,3 +272,4 @@ def searchByListMania(listManiaID, type="heavy", page=1, license_key=None, http_
 
 def searchSimilar(ASIN, type="heavy", page=1, license_key=None, http_proxy=None):
     return search("SimilaritySearch", ASIN, None, type, page, license_key, http_proxy)
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/others/asynchat.py b/others/asynchat.py
index 1ff395331..98407426b 100644
--- a/others/asynchat.py
+++ b/others/asynchat.py
@@ -291,3 +291,4 @@ def find_prefix_at_end (haystack, needle):
             result = nl-i
             break
     return result
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/others/asyncore.py b/others/asyncore.py
index 9dafedbea..dac5392c0 100644
--- a/others/asyncore.py
+++ b/others/asyncore.py
@@ -549,3 +549,4 @@ if os.name == 'posix':
             self._fileno = fd
             self.socket = file_wrapper (fd)
             self.add_channel()
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/others/cgitb.py b/others/cgitb.py
index 1ded278aa..0bd645244 100644
--- a/others/cgitb.py
+++ b/others/cgitb.py
@@ -280,3 +280,4 @@ def enable(display=1, logdir=None, context=5, format="html"):
     tracebacks to be written to files there."""
     sys.excepthook = Hook(display=display, logdir=logdir,
                           context=context, format=format)
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/others/google.py b/others/google.py
index 1fbeb84ef..8e38ae538 100644
--- a/others/google.py
+++ b/others/google.py
@@ -430,3 +430,4 @@ def main(argv):
 
 if __name__ == '__main__':
     main(sys.argv[1:])
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/others/shlex.py b/others/shlex.py
index b6f99b418..d91ab46cd 100644
--- a/others/shlex.py
+++ b/others/shlex.py
@@ -210,3 +210,4 @@ if __name__ == '__main__':
             print "Token: " + repr(tt)
         else:
             break
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/others/unittest.py b/others/unittest.py
index c24bcd933..e69d706ad 100644
--- a/others/unittest.py
+++ b/others/unittest.py
@@ -720,3 +720,4 @@ main = TestProgram
 
 if __name__ == "__main__":
     main(module=None)
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/others/urllib2.py b/others/urllib2.py
index 5529617e7..733e4c8b9 100644
--- a/others/urllib2.py
+++ b/others/urllib2.py
@@ -1112,3 +1112,4 @@ if __name__ == "__main__":
             print "read %d bytes" % len(buf)
         print
         time.sleep(0.1)
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/BadWords.py b/plugins/BadWords.py
index 30ab787b3..c511f0014 100644
--- a/plugins/BadWords.py
+++ b/plugins/BadWords.py
@@ -106,3 +106,4 @@ class BadWords(callbacks.Privmsg):
 
 
 Class = BadWords
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/ChannelLogger.py b/plugins/ChannelLogger.py
index 09c6e857c..6f72f3b0b 100644
--- a/plugins/ChannelLogger.py
+++ b/plugins/ChannelLogger.py
@@ -151,3 +151,4 @@ class ChannelLogger(irclib.IrcCallback):
 
 
 Class = ChannelLogger
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/ChannelStats.py b/plugins/ChannelStats.py
index 11d4ac8e1..e558fa6e5 100644
--- a/plugins/ChannelStats.py
+++ b/plugins/ChannelStats.py
@@ -77,4 +77,4 @@ class ChannelStats(callbacks.Privmsg, DBHandler):
 
 
 Class = ChannelStats
-
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/Ctcp.py b/plugins/Ctcp.py
index 94f6b3cde..0552f5fc0 100644
--- a/plugins/Ctcp.py
+++ b/plugins/Ctcp.py
@@ -72,3 +72,4 @@ class Ctcp(callbacks.PrivmsgRegexp):
         irc.queueMsg(notice(msg.nick, s))
 
 Class = Ctcp
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/Factoids.py b/plugins/Factoids.py
index 3c9c867f1..67f6d4752 100644
--- a/plugins/Factoids.py
+++ b/plugins/Factoids.py
@@ -210,3 +210,4 @@ class Factoids(DBHandler, callbacks.Privmsg):
 
 
 Class = Factoids
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/FixRelayBot.py b/plugins/FixRelayBot.py
index ca9e49256..15feae750 100644
--- a/plugins/FixRelayBot.py
+++ b/plugins/FixRelayBot.py
@@ -53,3 +53,4 @@ class FixRelayBot(irclib.IrcCallback):
 
 
 Class = FixRelayBot
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/Forums.py b/plugins/Forums.py
index cc173c271..ba7c9135b 100644
--- a/plugins/Forums.py
+++ b/plugins/Forums.py
@@ -93,3 +93,4 @@ class Forums(callbacks.PrivmsgRegexp):
 
 
 Class = Forums
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/FreeBSD.py b/plugins/FreeBSD.py
index df450a9af..d89f2115a 100755
--- a/plugins/FreeBSD.py
+++ b/plugins/FreeBSD.py
@@ -217,3 +217,4 @@ Class = FreeBSD
 
 if __name__ == '__main__':
     makeDb(dbFile, getIndex(), replace=True)
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/FunCommands.py b/plugins/FunCommands.py
index aff15867c..b5f83b337 100644
--- a/plugins/FunCommands.py
+++ b/plugins/FunCommands.py
@@ -367,3 +367,4 @@ class FunCommands(callbacks.Privmsg):
             
 
 Class = FunCommands
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/FunDB.py b/plugins/FunDB.py
index 954cb8ce6..e1246a61d 100755
--- a/plugins/FunDB.py
+++ b/plugins/FunDB.py
@@ -297,4 +297,4 @@ if __name__ == '__main__':
     db.commit()
     db.close()
             
-            
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: 
diff --git a/plugins/Http.py b/plugins/Http.py
index 42eebeb8e..b5ad48358 100644
--- a/plugins/Http.py
+++ b/plugins/Http.py
@@ -210,3 +210,4 @@ class Http(callbacks.Privmsg):
 
 
 Class = Http
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/Moobot.py b/plugins/Moobot.py
index 33e72405c..b9e1358c4 100644
--- a/plugins/Moobot.py
+++ b/plugins/Moobot.py
@@ -208,3 +208,4 @@ class Moobot(callbacks.Privmsg):
 
 
 Class = Moobot
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/NickServ.py b/plugins/NickServ.py
index 5ef403983..79a8ee53f 100644
--- a/plugins/NickServ.py
+++ b/plugins/NickServ.py
@@ -78,3 +78,4 @@ class NickServ(callbacks.Privmsg):
 
 
 Class = NickServ
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/Parter.py b/plugins/Parter.py
index 33c59ca66..89f3f3fb0 100644
--- a/plugins/Parter.py
+++ b/plugins/Parter.py
@@ -70,3 +70,4 @@ class Parter(callbacks.Privmsg):
 
 
 Class = Parter
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/Quotes.py b/plugins/Quotes.py
index 5963fec7c..f198e6f58 100644
--- a/plugins/Quotes.py
+++ b/plugins/Quotes.py
@@ -167,3 +167,4 @@ class Quotes(DBHandler, callbacks.Privmsg):
         
 
 Class = Quotes
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/RawLogger.py b/plugins/RawLogger.py
index 27eed9cdd..30303ddac 100644
--- a/plugins/RawLogger.py
+++ b/plugins/RawLogger.py
@@ -53,3 +53,4 @@ class RawLogger(irclib.IrcCallback):
 
 
 Class = RawLogger
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/Relay.py b/plugins/Relay.py
index 796e92c54..8600f802c 100644
--- a/plugins/Relay.py
+++ b/plugins/Relay.py
@@ -39,3 +39,4 @@ class Relay(callbacks.Privmsg):
     def relayconnect(self, irc, msg, args):
         "<domain:port> (port defaults to 6667)"
         pass
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/RootWarner.py b/plugins/RootWarner.py
index e390ca89c..10a6b2e84 100644
--- a/plugins/RootWarner.py
+++ b/plugins/RootWarner.py
@@ -50,3 +50,4 @@ class RootWarner(irclib.IrcCallback):
 
 
 Class = RootWarner
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/ThreadedFunCommands.py b/plugins/ThreadedFunCommands.py
index fa1aa6b90..1f3bacba7 100644
--- a/plugins/ThreadedFunCommands.py
+++ b/plugins/ThreadedFunCommands.py
@@ -60,3 +60,4 @@ class ThreadedFunCommands(callbacks.Privmsg):
 
 
 Class = ThreadedFunCommands
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/Topic.py b/plugins/Topic.py
index 5c8bc7dde..c8e84d1a3 100644
--- a/plugins/Topic.py
+++ b/plugins/Topic.py
@@ -100,3 +100,4 @@ class Topic(callbacks.Privmsg):
 
 
 Class = Topic
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/Unix.py b/plugins/Unix.py
index 363617717..9937c96f0 100644
--- a/plugins/Unix.py
+++ b/plugins/Unix.py
@@ -87,3 +87,4 @@ class Unix(callbacks.Privmsg):
 
 
 Class = Unix
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/Utils.py b/plugins/Utils.py
index e215a04da..36d780238 100644
--- a/plugins/Utils.py
+++ b/plugins/Utils.py
@@ -46,3 +46,4 @@ class Utils(callbacks.Privmsg):
         irc.reply(msg, first+second)
 
 Class = Utils
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/baseplugin.py b/plugins/baseplugin.py
index 71e55586e..3ae1f28c1 100644
--- a/plugins/baseplugin.py
+++ b/plugins/baseplugin.py
@@ -43,3 +43,4 @@ class DBHandler(object):
     def die(self):
         for db in self.dbCache.itervalues():
             db.close()
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/plugins/template.py b/plugins/template.py
index ae2927dbb..c5d1bfad0 100644
--- a/plugins/template.py
+++ b/plugins/template.py
@@ -31,4 +31,4 @@
 
 from baseplugin import *
 
-
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/sandbox/Debian.py b/sandbox/Debian.py
index d1be1d7dc..be8e16d53 100644
--- a/sandbox/Debian.py
+++ b/sandbox/Debian.py
@@ -115,3 +115,4 @@ Class = Debian
 
 if __name__ == '__main__':
     makeDb(dbFile, getIndex(), replace=True)
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/sandbox/anagrams.py b/sandbox/anagrams.py
index 4b2b209ca..a08bad677 100644
--- a/sandbox/anagrams.py
+++ b/sandbox/anagrams.py
@@ -124,3 +124,4 @@ if __name__ == '__main__':
     for line in sys.stdin:
         db.add(line.translate(trans, '\n'))
     db.flush()
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/sandbox/averagePrefix.py b/sandbox/averagePrefix.py
index 12cc3236b..4691f3a02 100644
--- a/sandbox/averagePrefix.py
+++ b/sandbox/averagePrefix.py
@@ -16,3 +16,4 @@ if __name__ == '__main__':
             total += len(msg.prefix)
             lines += 1
     print total / lines
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/sandbox/debian.py b/sandbox/debian.py
index 914dd5bdc..6cee3823a 100644
--- a/sandbox/debian.py
+++ b/sandbox/debian.py
@@ -58,3 +58,4 @@ if __name__ == '__main__':
     start = time.time()
     makeContentsDb(sys.argv[1])
     print 'Took %s seconds.' % time.time() - start
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/sandbox/friendly.py b/sandbox/friendly.py
index 43fc0ab17..454945e38 100644
--- a/sandbox/friendly.py
+++ b/sandbox/friendly.py
@@ -45,3 +45,4 @@ class Friendly(callbacks.PrivmsgRegexp):
         "(?:good)?bye|adios|vale|ciao|au revoir|seeya|night"
         if re.search(irc.nick, msg.args[1]):
             self.reply('vale, amic(e|a)!')
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/sandbox/makescript.py b/sandbox/makescript.py
index 9f820f597..aad9ffe13 100755
--- a/sandbox/makescript.py
+++ b/sandbox/makescript.py
@@ -58,3 +58,4 @@ for line in sys.stdin:
     print """INSERT INTO words VALUES (NULL, '%s', (SELECT id FROM sorted_words WHERE word='%s'));""" % (word, sorted)
 
 print """END TRANSACTION;"""
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/sandbox/rbot.py b/sandbox/rbot.py
index a6b4052ed..0b9216313 100644
--- a/sandbox/rbot.py
+++ b/sandbox/rbot.py
@@ -46,4 +46,4 @@ def Rbot(callbacks.Privmsg):
         if target in ('me', 'yourself', 'himself', irc.nick):
             target = msg.nick
         #'%s %s %s'
-
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/sandbox/twistedDrivers.py b/sandbox/twistedDrivers.py
index a8f60225b..8bb162edc 100644
--- a/sandbox/twistedDrivers.py
+++ b/sandbox/twistedDrivers.py
@@ -15,4 +15,4 @@ class TwistedDriver(drivers.IrcDriver, twisted.protocols.basic.LineReceiver):
         self.irc = irc
         irc.driver = irc
         self.delimiter = '\n'
-
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/sandbox/usersXml.py b/sandbox/usersXml.py
index 45ac67f73..ba02af546 100644
--- a/sandbox/usersXml.py
+++ b/sandbox/usersXml.py
@@ -32,3 +32,4 @@ class UsersHandler(xml.sax.handler.ContentHandler):
             self.name = ''
             self.u = None
         self.chars = ''
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/scripts/clean.py b/scripts/clean.py
index b59c06818..676c41c74 100755
--- a/scripts/clean.py
+++ b/scripts/clean.py
@@ -15,3 +15,4 @@ if __name__ == '__main__':
     for name in os.listdir('conf'):
         os.remove(os.path.join('conf', name))
     os.path.walk(os.curdir, removeFiles, None)
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/scripts/dumpdb.py b/scripts/dumpdb.py
index 2ac4e62ec..22f789974 100755
--- a/scripts/dumpdb.py
+++ b/scripts/dumpdb.py
@@ -15,4 +15,4 @@ if __name__ == '__main__':
         key = db.nextkey(key)
     db.close()
     fd.close()
-
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/scripts/makedb.py b/scripts/makedb.py
index 0db27acb5..63fa52b73 100755
--- a/scripts/makedb.py
+++ b/scripts/makedb.py
@@ -21,3 +21,4 @@ if __name__ == '__main__':
             print 'Invalid line: %s' % line.strip()
     db.close()
     fd.close()
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/scripts/newplugin.py b/scripts/newplugin.py
index 09dd2e7ca..d36a04a94 100755
--- a/scripts/newplugin.py
+++ b/scripts/newplugin.py
@@ -9,3 +9,4 @@ if len(sys.argv) < 2:
     sys.exit(-1)
 
 shutil.copy('plugins/template.py', 'plugins/%s.py' % sys.argv[1])
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/scripts/removeSpaces.py b/scripts/removeSpaces.py
index a647d3b17..4f7d03b1d 100755
--- a/scripts/removeSpaces.py
+++ b/scripts/removeSpaces.py
@@ -32,4 +32,4 @@ if __name__ == '__main__':
     x.x = 0
     os.path.walk(dir, visit, x)
     print '%s bytes removed.' % x.x
-
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/src/ansi.py b/src/ansi.py
index c6c335ffb..7497c3386 100644
--- a/src/ansi.py
+++ b/src/ansi.py
@@ -110,3 +110,4 @@ WHITEBG = '\033[47m'
 #def clrtoeol():
 #  'Clears screen to end of line'
 #  print '\033[K'
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/src/asyncoreDrivers.py b/src/asyncoreDrivers.py
index be8d9428e..f8a5e8dd4 100644
--- a/src/asyncoreDrivers.py
+++ b/src/asyncoreDrivers.py
@@ -235,3 +235,4 @@ if conf.telnetEnable and __name__ != '__main__':
 if __name__ == '__main__':
     ReplListener()
     asyncore.loop()
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/src/bot.py b/src/bot.py
index a7654fdff..c44c61a73 100755
--- a/src/bot.py
+++ b/src/bot.py
@@ -149,3 +149,4 @@ def main():
 
 if __name__ == '__main__':
     main()
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/src/callbacks.py b/src/callbacks.py
index bc87bcab2..c200cb42b 100644
--- a/src/callbacks.py
+++ b/src/callbacks.py
@@ -394,3 +394,4 @@ class PrivmsgRegexp(Privmsg):
                 if msg:
                     irc = IrcObjectProxyRegexp(irc)
                     self.callCommand(method, (irc, msg, m))
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/src/cdb.py b/src/cdb.py
index 25813a9b3..e2b5064a4 100644
--- a/src/cdb.py
+++ b/src/cdb.py
@@ -447,4 +447,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:
diff --git a/src/conf.py b/src/conf.py
index 9b8159722..7359add24 100644
--- a/src/conf.py
+++ b/src/conf.py
@@ -171,3 +171,4 @@ prefixChars = '@'
 ###############################
 ###############################
 ###############################
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/src/debug.py b/src/debug.py
index d34260a95..e868962c8 100644
--- a/src/debug.py
+++ b/src/debug.py
@@ -185,3 +185,4 @@ def tracer(frame, event, _):
         s = '%s: %s\n' % (frame.f_code.co_filename, frame.f_code.co_name)
         _tracefd.write(s)
         _tracefd.flush()
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/src/drivers.py b/src/drivers.py
index 064b1c39e..3d63d1512 100644
--- a/src/drivers.py
+++ b/src/drivers.py
@@ -139,3 +139,4 @@ def run():
            _drivers[name].die()
            del _drivers[name]
        _drivers[name] = driver
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/src/fix.py b/src/fix.py
index fe24a2435..f83f7d136 100644
--- a/src/fix.py
+++ b/src/fix.py
@@ -201,4 +201,4 @@ def enumerate(L):
 def window(L, size):
     for i in xrange(len(L) - (size-1)):
         yield L[i:i+size]
-
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/src/ircdb.py b/src/ircdb.py
index 6e9cd1410..d61971c8c 100644
--- a/src/ircdb.py
+++ b/src/ircdb.py
@@ -482,3 +482,4 @@ def checkCapabilities(hostmask, capabilities, requireAll=False):
 #################################################
 #################################################
 startup = False
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/src/irclib.py b/src/irclib.py
index 5326845de..8aa1cabde 100644
--- a/src/irclib.py
+++ b/src/irclib.py
@@ -387,3 +387,4 @@ class Irc(object):
         for callback in self.callbacks:
             callback.die()
         world.ircs.remove(self)
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/src/ircmsgs.py b/src/ircmsgs.py
index 5659ff071..238716c33 100644
--- a/src/ircmsgs.py
+++ b/src/ircmsgs.py
@@ -326,3 +326,4 @@ def whois(nick):
 
 def invite(channel, user):
     return IrcMsg(command='INVITE', args=(channel, user))
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/src/ircutils.py b/src/ircutils.py
index 62cd7379a..62ae43219 100644
--- a/src/ircutils.py
+++ b/src/ircutils.py
@@ -189,4 +189,4 @@ class nick(str):
 if __name__ == '__main__':
     import sys, doctest
     doctest.testmod(sys.modules['__main__'])
-
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/src/privmsgs.py b/src/privmsgs.py
index 6f73ca860..45f220e15 100644
--- a/src/privmsgs.py
+++ b/src/privmsgs.py
@@ -1182,3 +1182,4 @@ standardPrivmsgModules = (OwnerCommands,
                           ChannelCommands,
                           UserCommands,
                           MiscCommands)
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/src/repl.py b/src/repl.py
index 5056c1692..d16eb5da7 100644
--- a/src/repl.py
+++ b/src/repl.py
@@ -129,3 +129,4 @@ if __name__ == '__main__':
             prompt = '>>> '
         else:
             prompt = '... '
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/src/schedule.py b/src/schedule.py
index 9f8da9a95..b5063c27e 100644
--- a/src/schedule.py
+++ b/src/schedule.py
@@ -85,4 +85,4 @@ removeEvent = schedule.removeEvent
 addPeriodicEvent = schedule.addPeriodicEvent
 removePeriodicEvent = removeEvent
 run = schedule.run
-
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/src/world.py b/src/world.py
index 24e161359..5be63fa82 100644
--- a/src/world.py
+++ b/src/world.py
@@ -194,3 +194,4 @@ def superReload(module):
                                   ('func_code', 'func_defaults', 'func_doc'))
     return module
 '''
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/tools/conv.py b/tools/conv.py
index b388f4870..b24ba4bb9 100644
--- a/tools/conv.py
+++ b/tools/conv.py
@@ -28,4 +28,4 @@ if __name__ == '__main__':
             print 'Invalid Syntax, line %s' % lineno
     maker.finish()
 
-
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/tools/identd.py b/tools/identd.py
index 818921a70..38be9af47 100644
--- a/tools/identd.py
+++ b/tools/identd.py
@@ -58,4 +58,4 @@ if __name__ == '__main__':
     if os.fork() != 0:
         sys.exit(0)
     asyncore.loop()
-
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: