Add check to run MacVim binary of vim if on Mac, vundle YouCompleteMe
Merge branch 'master' of http://github.com/josephl/.dot

Conflicts:
	vimrc