Add support for yaml and elixir.
Merge branch 'master' of github.com:jmacdonald/dotfiles

Conflicts:
	vimrc