Order is gas/electricity contracts can be different for some customers

[timstegeman]

I had still the issue with duplicate devices. It looked that the order in which I receive my contracts are different. This would fix it for both scenarios.

(Also this removes some duplicate code)

Continuation on PR #45

[fsaris]

Tnx for the PR