Port to latest holoviews#688

fcr wants to merge 7 commits intoioam:masterioam/topographica:masterfrom

fcr:masterfcr/topographica:masterCopy head branch name to clipboard