Merge branch 'remove-old-options' of https://github.com/kberg/dygraphs into remove...

Conflicts:
	dygraph.js

diff --cc Makefile
index 6a645a5,6a645a5..a307c72
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -4,7 -4,7 +4,7 @@@
  #
  # Dean Wampler <dean@deanwampler.com> March 22, 2010
  
--all: generate-combined
++all: test generate-combined
  
  generate-combined:
        @echo Generating dygraph-combined.js
@@@ -18,3 -18,3 +18,6 @@@ generate-gwt
  
  test:
        @./test.sh
++
++lint:
++      @./lint.sh