Fix merge
Add erlang plugin
Merge branch 'master' of github.com:edgurgel/vimrc

Conflicts:
	.vimrc