improvement of wind and solar capacity factor calibration: -make sure…

Created by: christophbertram

… that capacities in 2015 and 2020 are used optimally, and only adjust vm_capFac (via pm_cf), instead of "nur" and "maxprod" values. Phase-out of calibration for reduced capacity factor until 2030 for spv and 2045 for wind (evoloving turbing design). improvement of 2020 bounds: include 2019 capacity data (thus raising the lower bound), and lower upper bounds to 25% over 2019 (or alternatively 20% over 2015-2019 average, or seed values for small) as growth from 2019-2020 will be limited.