fix init.el
tweak vimrc
more tweaks for buffer and window switching