massive vim things
remove things likely to cause merge conflicts