merge vimrc from colorfix branch