Merge branch 'master' into #44_photons
Merge branch 'master' into #4
Merge pull request #155 from GalSim-developers/#4

#4 - Numerical recipes spline removed from code, now use Mike's TMV, regression tests added
Make im.copy() copy the scale
(#44_photons)
Merge branch 'master' into #129
minor typo fixes and clarification in documentation
(#44_photons)
Merging in from 44
(#141)
Merge branch 'master' into #141
Merge branch 'master' into #21_DOxygen_documentation
Merge branch 'master' into #103
Redo a bit how scale gets set.  I think this is unnecessary, but the result is slightly cleaner code.
(#44_photons)
Merge branch '#44_photons' of github.com:GalSim-developers/GalSim into #44_photons
Merge pull request #156 from GalSim-developers/#44_photons

#44 photons
Merge branch 'master' into #103
Merge branch 'master' into #21_DOxygen_documentation
Merge pull request #157 from GalSim-developers/#129

#129 - Added repr() and str() methods to position, bounds, shear and ellipse classes
Merge branch 'master' into #103
merged master into #105, resolved slight conflict in base.py
(#105_Kolmogorov_PSF)
Merge branch 'master' of https://github.com/GalSim-developers/GalSim
Merge from master
(#141)