vimux
remvoing vimux
Merge branch 'master' of github.com:gabrielrios/dotfiles

Conflicts:
	aliasrc
	tmux.conf
	vimrc
	zshrc
conflict on vimrc