Updated core vim and bash files
Merge branch 'master' of github.com:weeksghost/dotfiles

Conflicts:
	mac/.vim/bundle/YouCompleteMe