Revert "Bind SPC q to 'kill-buffer-and-window"

This reverts commit 8a90a82782e9e62c5ad777b5b9462e2853abecfd.