vimrc
merged vimrc from master