add vim pane movement and a couple litle tweaks
merge conflict