Merge pull request #852 from bradymiller/dygraphs_2