confrict fix
Merge branch 'master' of https://github.com/KeizoBookman/vimrc_mine