Merge branch 'master' of git://github.com/tpope/vim-rails

Conflicts:

	autoload/rails.vim

Author: wmoxam

.gitignore

@@ -0,0 +1,3 @@
+/rails.zip
+/rails.vba
+/doc/tags

Rakefile

@@ -32,6 +32,7 @@ task :publish => [:zip,:vimball] do
   Rake::SshFilePublisher.new("tpope.net","/var/www/railsvim",".","rails.zip","rails.vba").upload
 end
 
+desc "Install"
 task :install do
   vimfiles = if ENV['VIMFILES']
                ENV['VIMFILES']