expandtabs to spaces for ruby
Merge branch 'master' of github.com:ludflu/vim-config

Conflicts:
	vimrc