Formatting updates after merge, so that it all looks consistent in VIM