Install 'mattn/zencoding-vim'

zencoding will help us to work with html and css more productive.
Merge remote-tracking branch 'origin/master'

Conflicts:
	vim/vimrc.symlink