Merged and now compiles

Main document DisserationProposal.tex updated to compile and work with
the Latex-base submodule.  In addition, I got the missing figure to
work, and corrected some compilation errors.