Moved canvas+backends out of opengl subdir
fixed bug from prior merge
Merge branch 'master' of github.com:pyvis/pyvis