NREL: Solar-plus-storage could be competitive by 2020