Merge pull request #242 from beckel/master

Added reactive power to the ECO data set converter