Added search highlight and vim-commentary