More uniformity
4 spaces
Fix Makefile
Split out a lot of stuff into _config.yml