Better Makefile.
Clean up duplicate definitions.
Merge branch 'cmu-2013-fall' of github.com:favonia/hott-notes into cmu-2013-fall