makefile shenanigans
merged, now getting a bibtex error I don't know what to do with...