Update makefile and setup.py requirements

Makefile

@@ -1,3 +1,6 @@
+URL="http://bucket.mit.edu:8080/nilmdb"
+#URL="http://localhost/nilmdb"
+
 all:
 ifeq ($(INSIDE_EMACS), t)
 	@make test
@@ -7,9 +10,9 @@ endif
 
 test:
 	-@make install >/dev/null 2>&1
-	nilmtool -u "http://localhost/nilmdb" remove /test/foo -s min -e max
+	nilmtool -u ${URL} remove /test/foo -s min -e max
 	python src/sinefit.py \
-	-u "http://localhost/nilmdb" -c 4 \
+	-u ${URL} -c 4 -f 60 \
 	/lees-compressor/no-leak/raw/1 /test/foo
 
 test2:

setup.py

@@ -62,6 +62,9 @@ setup(name='nilmtools',
       license = "Proprietary",
       author_email = 'jim@jtan.com',
       install_requires = [ 'nilmdb >= 1.3.0',
+                           'numpy',
+                           'scipy',
+                           'matplotlib',
                            ],
       packages = [ 'nilmtools',
                    ],