Mkae scipy a requirement. Too many things require it.
Automatic Py3k merge for testing