use net export for nyiso
combine net export in caiso
update trade tests for net export
Merge pull request #5 from WattTime/net_trade

Net trade