Updated RPS constraint, size of runs

Fixed RPS to only look at the applicable year. Model updated to run for
20 years.