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
noticed minor dox inconsistency, modified with a relevant example...
noticed other very minor dox issue
fixed whitespace
Merge pull request #373 from GalSim-developers/#298

#298 Make wrapping work with numpy 1.7
Merge branch 'master' of github.com:GalSim-developers/GalSim
Merge branch 'master' into #304
Merge branch '#304' of github.com:GalSim-developers/GalSim into #304