update vimrc
trying to fix unite for grep like qf
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	vimrc