Fix problem with the newer version of Factory Girl

Thanks @GMFlash!

Closes #586

shoulda_macros/paperclip.rb

@@ -109,8 +109,14 @@ if defined?(ActionController::Integration::Session)
   end
   end
 end
 end
 
 
-class Factory
-  include Paperclip::Shoulda  #:nodoc:
+if defined?(FactoryGirl::Factory)
+  class FactoryGirl::Factory
+    include Paperclip::Shoulda  #:nodoc:
+  end
+else
+  class Factory
+    include Paperclip::Shoulda  #:nodoc:
+  end
 end
 end
 
 
 class Test::Unit::TestCase #:nodoc:
 class Test::Unit::TestCase #:nodoc: