CAPFILE IS A RUBY FILE
Merge branch 'master' of https://github.com/kryali/.vim

* 'master' of https://github.com/kryali/.vim:
  shit didn't work anyway

Conflicts:
	vimrc