MAINT: Change test to use context manager
DOC: Fix annoying comment from @gregcaporaso
Merge pull request #533 from ElDeveloper/minor-fixes

DOC: Minor fixes to a few files