FIX: Fixing Incomes (#64)

* Updating incomes to include predictions and make incomeType optional

* Fixing from comments

* Fixing tests

Author: juliehubs