diff --git a/dotfiles/config/nvim/init.vim b/dotfiles/config/nvim/init.vim
index 5c16afc..de39810 100644
--- a/dotfiles/config/nvim/init.vim
+++ b/dotfiles/config/nvim/init.vim
@@ -73,10 +73,6 @@ if !has("win32") || !has("win16")
   endfunction
   Plug 'Valloric/YouCompleteMe', { 'do': function('BuildYCM') }
 
-  " Tree explorer
-  "Instead of forcing vim to start Nerdtree just do it manually
-  " autocmd vimenter * NERDTree  " make NERDTree come up automatically
-  " on vim start
 
   Plug 'scrooloose/nerdtree'
   " For nerdtree indicators of what has changed
@@ -93,19 +89,21 @@ Plug 'godlygeek/tabular'
 Plug 'plasticboy/vim-markdown'
 
 " Snippet Support/Configuration
-Plug 'SirVer/ultisnips'
-Plug 'honza/vim-snippets'
+" Currently disabled because it irrepairably causes neovim to detonate more
+" than I care to deal with as of 5/26/2017
+"Plug 'SirVer/ultisnips'
+"Plug 'honza/vim-snippets'
 
 " Database engine support
 Plug 'https://github.com/vim-scripts/dbext.vim'
 
-let g:UltiSnipsExpandTrigger="<c-s>"
-let g:UltiSnipsJumpForwardTrigger="<c-b>"
-let g:UltiSnipsJumpBackwardTrigger="<c-z>"
-let g:UltiSnipsSnippetsDir=["~/.config/nvim/plugged/vim-snippets/UltiSnips", "~/.config/nvim/snippets"]
+"let g:UltiSnipsExpandTrigger="<c-s>"
+"let g:UltiSnipsJumpForwardTrigger="<c-b>"
+"let g:UltiSnipsJumpBackwardTrigger="<c-z>"
+"let g:UltiSnipsSnippetsDir=["~/.config/nvim/plugged/vim-snippets/UltiSnips", "~/.config/nvim/snippets"]
 
-" Allow UltiSnips to split the window vertically
-let g:UltiSnipssEditSplit="vertical"
+"" Allow UltiSnips to split the window vertically
+"let g:UltiSnipssEditSplit="vertical"
 
 """""""""""""""""""""""""""""""
 
diff --git a/dotfiles/tmux.conf b/dotfiles/tmux.conf
index d30ba78..699e36f 100644
--- a/dotfiles/tmux.conf
+++ b/dotfiles/tmux.conf
@@ -4,6 +4,8 @@
 #                                 #
 ###################################
 
+# Make sure screen is properly set for tmux
+set-option -g default-terminal "screen-256color"
 
 # Rebind tmux prefix to <c-space> to match vim
 
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index 0d617f6..bf927d6 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -13,7 +13,7 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then
 fi
 export EDITOR="$VISUAL"
 export ITERM_24BIT=1
-export TERM=xterm-256color
+export TERM=screen-256color
 export GOPATH=$HOME/go/
 export PATH=$PATH:"$GOPATH/bin"