Merge pull request #237 from ralexstokes/builder-subsidy-from-config

Merge pull request #237 from ralexstokes/builder-subsidy-from-config #643