Fixed setup.py
Import stat from scipy
Resolving conflict -Using server versions
Merge branch 'master' of https://github.com/EoinTravers/Squeak