Make wraps work with numpy version 1.7 API
Merge branch 'master' into #298
Add normal try block to assert_raises tests that were missing it
Merge branch 'master' into #298
Merge pull request #373 from GalSim-developers/#298

#298 Make wrapping work with numpy 1.7