Be resilient to transient make failures (for example, when linking clang)
Add configs for dev machine
Quick fix for dev config
Add mercurial and make to Dockerfile.dev