lots of small changes to both vim and bash