Switch to KWBD from KWBDI

Both plugins close the current buffer without altering the window
layout. KWBD has the benefit of exposing a proper command which allows
for more general usage.
Simplify search and replace mappings