Fix .vimrc and some minor stuff