Re-enable doctests and fix or ignore them all
Merge branch 'master' into gh-pages
Update docs