Merge branch 'canvas' of https://github.com/clocksmith/dygraphs