BUG: fixes for scipy .0.9.0 to 0.13.0 induced errors
Merge pull request #1 from sjsrey/scipy13

BUG: fixes for scipy .0.9.0 to 0.13.0 induced errors