Merged changes into Ubuntu vimrc