Merge pull request #1 from cgranade/master

updates
Trivial fixes for doctests.
Merge pull request #3 from silky/master

Trivial fixes for doctests