merge master and fix vimrc conflicts