various changes in run.py output
Merge branch 'master' of https://github.com/nkurinsky/SurveySim

Conflicts:
	trunk/output/output.fits