updated vim to remove folding and added makeshift
Merge branch 'master' of https://github.com/octopuscabbage/octopuscabbagevimconf

Conflicts:
	.vimrc