Add mkdir ~/.vim/tmp
Merge branch 'master' into mac