Updates and master vimrc