Vimrc cleanup and hickop color add