fix(builder): decouple from controller

closes #1097
replaces #1089
Merge pull request #1102 from deis/decouple_builder_and_controller

fix(builder): decouple from controller