Cleanup with new builder interface.
Merge branch 'develop' of github.com:Comcast/discovery into develop
Updated with cleaner interface.
Merged from develop.
Updated with cleaner interface.
Merge branch 'develop' of github.com:Comcast/discovery into develop
Merge branch '14' into develop
Merge branch 'develop' of github.com:Comcast/discovery into develop