Merge builder.go into runtime.go
Add missing comments to runtime.go
Add missing package import
Merge pull request #1825 from dotcloud/merge-builder-runtime

Refactor to merge builder.go into runtime.go