Don't use current bufnr/winnr - these are passed in now
More tweaks to vimscript wrapper, and some better exception handling