initial commit
vimrc in vim folder:

ln -s ~/.vim/vimrc ~/.vimrc
Merge branch 'vim/master'