Dotplot kshedden rebased of 1294

rebased version of pull #1294

Only one merge conflict in version0.6.rst

ready to merge if TravisCI is green in all pythons