Commented out 2020 from scenario years

New SIP only requires 2015, 2025, 2030, 2040
Merge pull request #2 from nmpeterson/master

No more 2020