Change to 1 EC/s = 1 MW to match convention throughout Karbonite
Merge remote-tracking branch 'upstream/master'
Merge pull request #82 from bpuk/master

Change to 1 EC/s = 1 MW to match convention throughout Karbonite.
Merge remote-tracking branch 'upstream/master'