fixing all .elixir references to _elixir in Makefile
Merge branch 'master' into simple-release