Add tmuxinator script
Merge branch 'master' of github.com:benbeltran/dotfiles
Local vim/zsh changes
Merge branch 'master' of github.com:benbeltran/dotfiles
Merge branch 'master' of github.com:benbeltran/dotfiles

Conflicts:
	vimrc