Merge conflicts in vimrc zshrc

Replaced bundle with plugin
Merge branch 'master' of github.com:sajoku/dotfiles

Conflicts:
	vimrc
Remove autoclose, add plugin dir to ignore