Various minor edits, mainly typos.
Merge pull request #381 from abefrandsen/student_edits

Various minor edits, mainly typos.