Move to scipy 0.11 (plus pep8 changes)