resolving merge conflicts
(#306)
Merge branch '#297' into #306
First crack at DistDeviate (some parts not yet functioning, no documentation)
(#306)
Merge branch '#305' into #306

Conflicts:
	pysrc/SBInterpolatedImage.cpp
	pysrc/module.cpp

Merging latest changes of #305
Some interface and type checking structure changed in DistDeviate, plus addition of option to call it with two 1d arrays
Merge branch '#305' into #306 (with most recent branch this time!)

Conflicts:
	galsim/base.py
Merge branch '#297' into #306

Conflicts:
	CHANGELOG.md
	galsim/base.py
	pysrc/files.txt
	pysrc/module.cpp
Streamline DistDeviate code
Documentation ahoy!
Adding other BaseDeviate methods besides __call__
Merge branch '#297' into #306
Fix tabs, exclusion of CorrelatedNoise since it compiles now, and fixed naively copied function syntax
New innards to applyTo method (#306)
Put DistDeviate in __init__.py and some minor typo/bug fixes (missing self in seed() and reset(), min<=max check instead of max<=min) (#306)
Replacing call to integ.int1d with a simple addition loop, since the method now always uses equally-spaced abscissa points (#306)
Fixing the innards of the pieces that removes consecutive delta(CP(x))==0 points, and touching up the documentation.  (#306)
Documentation tweaks before changing interface to mostly keywords (#306)
Changing DistDeviate arguments to be mostly kwargs (#306)
Unit tests added (#306)
Merge branch 'master' into #306