Fix connection costs not properly factored in or discounted#232

BenWinchester merged 4 commits intodevCLOVER-energy/CLOVER:devfrom

225-connection-costs-not-properly-factored-in-or-discountedCLOVER-energy/CLOVER:225-connection-costs-not-properly-factored-in-or-discountedCopy head branch name to clipboard