Correct oversight that version wasn't imported from base into galsim namespace
Merge branch 'master' into #511

Conflicts:
	galsim/__init__.py