Merge branch 'master' of https://github.com/paulwalko/dotfiles

Conflicts:
	vimrc

vim/pack/plugins/opt/vim-solarized8

@@ -1 +0,0 @@
-Subproject commit c75b42d8a2207f7b514d2fa697a50051c4170b87

zshrc

@@ -2,17 +2,9 @@
 
 ## Set TERM for proper colors
 if [[ -z $TMUX ]]; then
-    if [ -e /usr/share/terminfo/x/xterm-256color ]; then # may be xterm-256 depending on your distro
     export TERM='xterm-256color'
 else
-        export TERM='xterm'
-    fi
-else
-    if [ -e /usr/share/terminfo/s/screen-256color ]; then
     export TERM='screen-256color'
-    else
-        export TERM='screen'
-    fi
 fi
 
 ### For local binaries (vim 8)