* Removed Pixa/Tinami sources

* Upgraded to Rails 3.2.3
* Fixed tests

test/unit/moderator/ip_addr_search_test.rb

@@ -4,11 +4,11 @@ module Moderator
   class IpAddrSearchTest < ActiveSupport::TestCase
     context "an ip addr search" do
       setup do
-        @user = Factory.create(:user)
+        @user = FactoryGirl.create(:user)
         CurrentUser.user = @user
         CurrentUser.ip_addr = "127.0.0.1"
         Danbooru.config.stubs(:member_comment_time_threshold).returns(1.week.from_now)
-        Factory.create(:comment)
+        FactoryGirl.create(:comment)
         MEMCACHE.flush_all
       end
   

test/unit/moderator/tag_batch_change_test.rb

@@ -4,10 +4,10 @@ module Moderator
   class TagBatchChangeTest < ActiveSupport::TestCase
     context "a tag batch change" do
       setup do
-        @user = Factory.create(:moderator_user)
+        @user = FactoryGirl.create(:moderator_user)
         CurrentUser.user = @user
         CurrentUser.ip_addr = "127.0.0.1"
-        @post = Factory.create(:post, :tag_string => "aaa")
+        @post = FactoryGirl.create(:post, :tag_string => "aaa")
       end
   
       teardown do