Committed updated Makefile and doxyfile.  (These don't need to be in here.)