Added both transitory and permanent income shocks, changed simulation.py to throw out bad draws