Adds searchinc to highlight matched words as you type
fix merge conflict with vimrc branch