Revert "Merge branch 'master' of https://github.com/jheg/GCEnergy"

This reverts commit 8208b4143a7cfdc65991d0351961f01abdcec856, reversing
changes made to f9a080ae4ec927c09492a4e3bf087a7828b2305d.
sectors final