fix(controller): inject config on top of existing environment
fix(controller): do not commit to latest

while this was a nice-to-have before, we are actually pushing config
values on top of the latest build, which breaks config:unset.
fix(controller): use build tag if present
Merge pull request #2127 from bacongobbler/2100_env_in_dockerfile

fix(controller): inject config on top of existing environment
feat(builder): inject GIT_SHA into builder apps
fix(builder): use proper dockerfile syntax
chore(*): bump CoreOS to 471.1.0
Merge pull request #2089 from bacongobbler/git_sha

feat(builder): inject GIT_SHA into builder apps
chore(release): update version to v0.13.1
Merge pull request #2152 from mboersma/bump-0.13.1

chore(release): update version to v0.13.1
Merge pull request #2150 from mboersma/coreos-471

chore(*): bump CoreOS to 471.1.0
fix(logger): kill temporary build container in "make build"

The two-stage Dockerfile build process leaves a temporary
container running after logger builds. This changes the Makefile
to catch and kill the temporary logger-build container.