Updated vim-elixir
Added some config for phpcomplete
Added type detection for .eex templates
Merge branch 'master' of github.com:davidstelter/.vim

Conflicts:
	vimrc