add Yii user stuff
Merge branch 'master' of github.com:jogi1/vimsetup

Conflicts:
	vimrc