....
Merge branch 'master' of github.com:pgolm/dotfiles

Conflicts:
	tag-vim/vimrc.bundles
	tag-vim/vimrc.keymap
some plugins