Better IncSearch highlighting

Makes 'IncSearch' a different color to 'Search' as per thebitguru's recommendation: https://github.com/chriskempson/base16-vim/issues/37
Fixes #39 vim cursorcolumn highlight issue
Merge branch 'master' of https://github.com/chriskempson/base16-builder