Replace rspec functions with vim-vroom
Merge branch 'master' of https://github.com/antonio/vim-config

Conflicts:
	vimrc