diff --git a/.travis.yml b/.travis.yml
index 9f4747c0..7546af90 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,10 +27,6 @@ matrix:
         - python: "3.5"
         - python: "pypy"
         - python: "pypy3"
-        - python: "2.6"
-          env: >-
-            USE_UCS2_PYTHON=1
-            UCS2_PYTHON_VARIANT="2.6"
         - python: "2.7"
           env: >-
             USE_UCS2_PYTHON=1
diff --git a/powerline/bindings/vim/__init__.py b/powerline/bindings/vim/__init__.py
index e617943a..b754c1f3 100644
--- a/powerline/bindings/vim/__init__.py
+++ b/powerline/bindings/vim/__init__.py
@@ -273,7 +273,7 @@ def _vim_to_python(value):
 
 if hasattr(vim, 'options'):
 	def vim_getbufoption(info, option):
-		return info['buffer'].options[str(option)]
+		return _vim_to_python(info['buffer'].options[str(option)])
 
 	def vim_getoption(option):
 		return vim.options[str(option)]
diff --git a/powerline/matchers/vim/__init__.py b/powerline/matchers/vim/__init__.py
index b2bad4cc..f6de45ed 100644
--- a/powerline/matchers/vim/__init__.py
+++ b/powerline/matchers/vim/__init__.py
@@ -7,7 +7,7 @@ from powerline.bindings.vim import vim_getbufoption, buffer_name
 
 
 def help(matcher_info):
-	return str(vim_getbufoption(matcher_info, 'buftype')) == 'help'
+	return vim_getbufoption(matcher_info, 'buftype') == 'help'
 
 
 def cmdwin(matcher_info):
@@ -16,4 +16,4 @@ def cmdwin(matcher_info):
 
 
 def quickfix(matcher_info):
-	return str(vim_getbufoption(matcher_info, 'buftype')) == 'quickfix'
+	return vim_getbufoption(matcher_info, 'buftype') == 'quickfix'
diff --git a/powerline/matchers/vim/plugin/commandt.py b/powerline/matchers/vim/plugin/commandt.py
index e4236f3e..7eefe9b7 100644
--- a/powerline/matchers/vim/plugin/commandt.py
+++ b/powerline/matchers/vim/plugin/commandt.py
@@ -3,9 +3,12 @@ from __future__ import (unicode_literals, division, absolute_import, print_funct
 
 import os
 
-from powerline.bindings.vim import buffer_name
+from powerline.bindings.vim import vim_getbufoption, buffer_name
 
 
 def commandt(matcher_info):
 	name = buffer_name(matcher_info)
-	return name and os.path.basename(name) == b'GoToFile'
+	return (
+		vim_getbufoption(matcher_info, 'filetype') == 'command-t'
+		or (name and os.path.basename(name) == b'GoToFile')
+	)