update zshrc vimrc gitconfig bundle.vim
Merge branch 'master' of github.com:kozyty/dotfiles

Conflicts:
	.gitconfig
	.zshrc