Merge branch 'option-consolidation' of https://github.com/kberg/dygraphs
Merge branch 'master' of https://github.com/danvk/dygraphs
Options now include defaults. Fix https://code.google.com/p/dygraphs/issues/detail?id=413
Merge branch 'master' of github.com:danvk/dygraphs

Conflicts:
	auto_tests/tests/Util.js
	auto_tests/tests/axis_labels.js
Merge pull request #192 from kberg/master

Options now includes default values. Fix bug so that you can set some options to null.