typo
(#411)
Merge branch 'master' into #411
fixed merge conflict
(#411)
merged changes in utilities.py from #343
(#411)
Merge branch 'master' into #411
Merge branch 'master' into #411
merged master in, fixed a couple of conflicts in utilities.py
(#411)
Merge branch 'master' into #411
Merge branch '#411' into #343

Conflicts:
	galsim/utilities.py