Added elixir support.
Merge branch 'master' of https://github.com/denic/git-config

Conflicts:
	bundles.vim