Update
Associate .elixir files with elixir-mode
Merge branch 'master' of github.com:bbatsov/prelude
Merge remote-tracking branch 'upstream/master'