Cleaned up doctests.
Merged master.