Merge branch 'option-consolidation' of https://github.com/kberg/dygraphs