Merged in vimrc from desktop