Updates and regorganises vimrc