added tmux plugin (tslime) to vim
Merge branch 'master' of github.com:kamykaze/dotfiles

Conflicts:
	.gitmodules