fix path
vimrc
Merge branch 'master' of github.com:sotarok/dotfiles
Merge branch 'master' of github.com:sotarok/dotfiles
update aliases
setup tmux.conf
submodule update: vundle.git
add tmux.conf
Merge branch 'master' of github.com:sotarok/dotfiles

Conflicts:
	zsh/.zshrc
add alias