Small fixes.

railties/bin/gen

@@ -23,7 +23,7 @@ if ARGV.size == 0
 
   puts "Please select a generator."
   puts "Builtin: #{rails.join(', ')}."
-  puts "Others: #{others.join(', ')}."
+  puts "Others: #{others.join(', ')}." unless others.empty?
 
   exit
 elsif ARGV.size == 1

railties/lib/generators/rails/integration_test/integration_test_generator.rb

 module Rails
   module Generators
     class IntegrationTestGenerator < NamedBase
-      check_class_collisions :suffix => "Test"
+      check_class_collision :suffix => "Test"
 
       def create_test_files
         template 'integration_test.rb', File.join('test/integration', class_path, "#{file_name}_test.rb")