Merge branch 'master' of https://github.com/mpld3/mplexporter

auto merge to bring local up to date with upstream