Include stracktrace on ExUnit timeouts
Ensure Mix.Config is deep merged
Merge branch 'master' of https://github.com/elixir-lang/elixir