Fixed some poorly merged bits of simulatedLightCurve.py
Merge branch 'master' of https://github.com/OSCAAR/OSCAAR-extras