need merge
Merge branch 'imag' of github.com:posva/dotfiles into imag

Conflicts:
	vimrc
fix imag