Took out Budget discounting

Took out the one sided "discounting" on the annual budget constraint.
Also tried to change solar PV costs to force model to not build one of
the sites, failed to do so.