Fix terminal colours, default to solarized
Tidy up vimrc