- little changes to vimrc
merged vim changes