Merge pull request #930 from wiredfool/2.6.x

2.6.x-rc test fixes
Version Bump -- 2.6.0
Fix manifest

Run `make pre` to check MANIFEST
Fix for regression in scipy
Version bump, 2.6.1