Add RedstoneControl to Electric Pump.
Merge branch 'master' into development