Add Some Plugins
Add php dict and Some Plugins(ZenCoding)
Merge branch 'master' of https://github.com/Pasopeso/dotfiles

Conflicts:
	.vimrc
Solve marge