Tidy up vimrc and deactivate github color scheme