Better filetype plugin structure
Merge branch 'master' of github.com:Sirupsen/vim-execrus

Conflicts:
	ftplugin/ruby.vim