more changes to make vim more like macvim