tidied .vimrc, changed colourscheme
merge conflicts