git stuff and vim stuff
merge