diff --git a/ftplugin/snippets.vim b/ftplugin/snippets.vim
index c38464d..6c53398 100644
--- a/ftplugin/snippets.vim
+++ b/ftplugin/snippets.vim
@@ -3,3 +3,10 @@
 " Fold by syntax, but open all folds by default
 setlocal foldmethod=syntax
 setlocal foldlevel=99
+
+" Define match words for use with matchit plugin
+" http://www.vim.org/scripts/script.php?script_id=39
+if exists("loaded_matchit") && !exists("b:match_words")
+  let b:match_ignorecase = 0
+  let b:match_words = '^snippet\>:^endsnippet\>,^global\>:^endglobal\>,\${:}'
+endif
diff --git a/test.py b/test.py
index 94dad25..1fbbc92 100755
--- a/test.py
+++ b/test.py
@@ -102,7 +102,6 @@ class VimInterfaceScreen(VimInterface):
             repl = lambda m: '\\' + m.group(0)
             s = re.sub( r"[$^#\\']", repl, s )
 
-        # Escape single quotes in command to protect from shell
         if sys.version_info >= (3,0):
             s = s.encode("utf-8")