Added keybinds for buffer switching
Merge remote-tracking branch 'origin/master'