Revert "Merge branch 'master' of git://github.com/Alex-hawks/UE-Electric-Expansion"

This reverts commit 114016b6bd956ba7f6c9d3f3d74981823a57b2a5, reversing
changes made to afc2f892742ace082eb12ad0d6fc334c1be5be21.
Merge pull request #57 from Alex-hawks/master

Fix the merges