Fixed peak demand query to be consistent with LOLE query.
Merge pull request #739 from quintel/peak_demand_fix

Fixed peak demand query to be consistent with LOLE query.