diff --git a/.tmux.conf b/.tmux.conf
index 6462c8a..30e827f 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -3,6 +3,8 @@ set-option -g prefix C-a
 bind-key C-a send-prefix
 set -g mouse on
 
+set -g default-terminal "screen-256color"
+
 # pane movement
 bind-key j command-prompt -p "join pane from:"  "join-pane -s '%%'"
 bind-key s command-prompt -p "send pane to:"  "join-pane -t '%%'"
diff --git a/.vimrc b/.vimrc
index e24cc75..1ca4438 100755
--- a/.vimrc
+++ b/.vimrc
@@ -18,7 +18,6 @@ if filereadable(expand(vundle_dir) . "/README.md")
     Plugin 'tpope/vim-surround'
     Plugin 'ctrlpvim/ctrlp.vim'
     Plugin 'rhysd/vim-clang-format'
-    " Plugin 'shougo/neocomplete'
     Plugin 'godlygeek/tabular'
     Plugin 'airblade/vim-gitgutter'
     Plugin 'jeetsukumaran/vim-pythonsense'
@@ -28,7 +27,9 @@ if filereadable(expand(vundle_dir) . "/README.md")
     Plugin 'nvie/vim-flake8'
     Plugin 'ludovicchabant/vim-gutentags'
     Plugin 'junegunn/vim-peekaboo'
-    Plugin 'ycm-core/YouCompleteMe'
+    if empty($VIM_DISABLE_YCM)
+        Plugin 'ycm-core/YouCompleteMe'
+    endif
 
     call vundle#end()            " required
 else