update config
update vimrc
Merge branch 'sanritz'