Fixes #35
Fixes #34
Fixes #36, and related to #12.
Making optional packages more exposed to students, and de-cluttering the cls
tocloft and subfigure don't play well together. Fixes #57
Merge pull request #58 from nps-lug/fix-package-conflicts

Fix package conflicts