fix erb abbrevs
Merge branch 'master' of github.com:lukaszkorecki/DotVim

Conflicts:
	vimrc