Update Makefile
Switch to YAML headers
Work on dissertation