fix missing paren from merge
fix doctest syntax for py3
Merge branch 'three' into three-travis