Merge branch 'master' into #401
removed warning about Sersic n in base.py since #365 supersedes it
(#401)
removed another statement unnec. after #365
(#401)
fixed bad logic in config
(#401)
fixed use of opt/ignore dicts in config/image.py
(#401)
fixed silly dox issues
(#401)
tidied up test script
(#401)
updated test_comparison_basic.py to print messages before processing so the user knows the code is working...
(#401)
added cool little print statements to test script output
(#401)
added module scope docstring about the test script, and a comment
(#401)
added warning if both n_photons and max_extra_noise are set
(#401)
typos
(#401)
Merge branch 'master' into #401

Conflicts:
	galsim/config/image.py
	galsim/config/stamp.py
added compromise, wordy text about use of galsim.Pixel
(#401)
added functionlity to use config with multiple galaxies, if it meets certain conditions
(#401)
fixed merge conflict
(#401)
Merge branch 'master' into #401
merged current state of #401 into this branch, fixed the odd conflict after changes on the PR
(#325)