Changed how ivar is generated

Updated prep.py so it will default to error array (if applicable)
Merge branch 'master' of https://github.com/astrofoley/astr596