added vim mulitple cursors and some tweaks
fixed merge conflicts