Merge branch 'master' of http://github.com/danvk/dygraphs

diff --cc docs/index.html
Simple merge

diff --cc dygraph-canvas.js
Simple merge

diff --cc dygraph.js
Simple merge