Merge pull request #3 from silky/master

Trivial fixes for doctests
Enabled Travis CI checking of doctest. See #3.
Merge pull request #2 from cgranade/master

sync with upstream