f
Merge branch 'origin/master'
-s
Merge pull request #85 from braincorp/fix_scipy_install_on_mac

Update scipy on mac