added key bindings for changing between buffers
merged origin/master