More scipy changes.
Verbose nosetests.
Automatic Py3k merge for testing