Add ruby text block matching
Merge branch 'master' of github.com:alexebird/dotfiles

Conflicts:
	.vimrc