Merge branch 'master' of https://github.com/bbatsov/prelude
Merge branch 'master' of https://github.com/martin-liu/prelude
Merge branch 'master' of https://github.com/bbatsov/prelude
Merge branch 'master' of https://github.com/martin-liu/prelude
Associate .elixir files with elixir-mode
Merge branch 'master' of github.com:bbatsov/prelude
merge upstream
merge upstream