Added some options for MacVim
Merge my_vimrc and .nvie_vimrc