Changed to spaces for everything except Makefiles (explicitly, as I name my files Makefile with a capital M and this apparently isn't picked up by vim's automation)