interchanged canvasToDOM and DOMtoCanvas to correspond with the docs.
Merge branch 'develop' of https://github.com/almende/vis into develop

Conflicts:
	dist/vis.js