Re-arrange .vimrc and improve search highlight