diff --git a/Gemfile b/Gemfile
index e6b62b3..7f5fae8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,7 @@
 source "https://rubygems.org"
 gem 'rails'
 gem 'fast_gettext'
+gem 'acts-as-taggable-on'
 
 # TODO needs a rebuild diff-lcs wrt wheezy
 
diff --git a/Gemfile.lock b/Gemfile.lock
index db7de1a..28fa821 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,6 +28,8 @@ GEM
     activesupport (3.2.6)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    acts-as-taggable-on (3.0.1)
+      rails (>= 3, < 5)
     arel (3.0.2)
     builder (3.0.0)
     erubis (2.7.0)
@@ -82,6 +84,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  acts-as-taggable-on
   fast_gettext
   rails
   rake
diff --git a/app/controllers/public/profile_controller.rb b/app/controllers/public/profile_controller.rb
index f1d0f66..2313a0c 100644
--- a/app/controllers/public/profile_controller.rb
+++ b/app/controllers/public/profile_controller.rb
@@ -32,7 +32,7 @@ class ProfileController < PublicController
     @tag = params[:id]
     @tag_cache_key = "tag_#{CGI.escape(@tag.to_s)}_#{profile.id.to_s}_page_#{params[:npage]}"
     if is_cache_expired?(@tag_cache_key)
-      @tagged = profile.find_tagged_with(@tag).paginate(:per_page => 20, :page => params[:npage])
+      @tagged = profile.tagged_with(@tag).paginate(:per_page => 20, :page => params[:npage])
     end
   end
 
diff --git a/app/controllers/public/search_controller.rb b/app/controllers/public/search_controller.rb
index 7cf89c1..ba7ab4f 100644
--- a/app/controllers/public/search_controller.rb
+++ b/app/controllers/public/search_controller.rb
@@ -133,7 +133,7 @@ class SearchController < PublicController
     @tag = params[:tag]
     @tag_cache_key = "tag_#{CGI.escape(@tag.to_s)}_env_#{environment.id.to_s}_page_#{params[:npage]}"
     if is_cache_expired?(@tag_cache_key)
-      @searches[@asset] = {:results => environment.articles.find_tagged_with(@tag).paginate(paginate_options)}
+      @searches[@asset] = {:results => environment.articles.tagged_with(@tag).paginate(paginate_options)}
     end
   end
 
diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb
index 44325ef..da2412a 100644
--- a/app/helpers/tags_helper.rb
+++ b/app/helpers/tags_helper.rb
@@ -9,7 +9,7 @@ module TagsHelper
 
   # <tt>tags</tt> must be a hash where the keys are tag names and the values
   # the count of elements tagged with the tag, as returned by
-  # Profile#find_tagged_with. If not tags were returned, just returns
+  # Profile#tagged_with. If not tags were returned, just returns
   # _('No tags yet.')
   #
   # <tagname_option> must be a symbol representing the key to be inserted in
diff --git a/app/models/article.rb b/app/models/article.rb
index 12b8276..f7dbf41 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -759,7 +759,7 @@ class Article < ActiveRecord::Base
 
   def sanitize_tag_list
     sanitizer = HTML::FullSanitizer.new
-    self.tag_list.names.map!{|i| strip_tag_name sanitizer.sanitize(i) }
+    self.tag_list.map!{|i| strip_tag_name sanitizer.sanitize(i) }
   end
 
   def strip_tag_name(tag_name)
diff --git a/app/models/profile.rb b/app/models/profile.rb
index 772008f..cfd6650 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -556,8 +556,8 @@ private :generate_url, :url_options
     end
   end
 
-  def find_tagged_with(tag)
-    self.articles.find_tagged_with(tag)
+  def tagged_with(tag)
+    self.articles.tagged_with(tag)
   end
 
   # Tells whether a specified profile has members or nor.
diff --git a/db/migrate/20140115190131_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb b/db/migrate/20140115190131_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb
new file mode 100644
index 0000000..fd81a6d
--- /dev/null
+++ b/db/migrate/20140115190131_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb
@@ -0,0 +1,18 @@
+# This migration comes from acts_as_taggable_on_engine (originally 1)
+class ActsAsTaggableOnMigration < ActiveRecord::Migration
+  def self.up
+    change_table :taggings do |t|
+      t.references :tagger, :polymorphic => true
+      t.string :context, :limit => 128
+    end
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+
+  def self.down
+    remove_index :taggings, [:taggable_id, :taggable_type, :context]
+    change_table :taggings do |t|
+      t.remove_references :tagger, :polymorphic => true
+      t.remove :context
+    end
+  end
+end
diff --git a/db/migrate/20140115190132_add_missing_unique_indices.acts_as_taggable_on_engine.rb b/db/migrate/20140115190132_add_missing_unique_indices.acts_as_taggable_on_engine.rb
new file mode 100644
index 0000000..35eee17
--- /dev/null
+++ b/db/migrate/20140115190132_add_missing_unique_indices.acts_as_taggable_on_engine.rb
@@ -0,0 +1,22 @@
+# This migration comes from acts_as_taggable_on_engine (originally 2)
+class AddMissingUniqueIndices < ActiveRecord::Migration
+
+  def self.up
+    add_index :tags, :name, unique: true
+
+    remove_index :taggings, :tag_id
+    remove_index :taggings, [:taggable_id, :taggable_type, :context]
+    add_index :taggings,
+      [:tag_id, :taggable_id, :taggable_type, :context, :tagger_id, :tagger_type],
+      unique: true, name: 'taggings_idx'
+   end
+
+  def self.down
+    remove_index :tags, :name
+
+    remove_index :taggings, name: 'taggings_idx'
+    add_index :taggings, :tag_id
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+
+end
diff --git a/lib/extended_tag.rb b/lib/extended_tag.rb
index ed49637..eafe8ab 100644
--- a/lib/extended_tag.rb
+++ b/lib/extended_tag.rb
@@ -1,4 +1,4 @@
-class Tag
+class ActsAsTaggableOn::Tag
 
   attr_accessible :name, :parent_id, :pending
 
@@ -25,7 +25,7 @@ class Tag
 
   # All the tags that can be a new parent for this tag, that is all but itself and its descendents to avoid loops
   def parent_candidates
-    Tag.find(:all) - descendents - [self]
+    ActsAsTaggableOn::Tag.find(:all) - descendents - [self]
   end
   
   # All tags that have this tag as its one of its ancestors
diff --git a/test/unit/article_test.rb b/test/unit/article_test.rb
index 3e372d6..ae93ef7 100644
--- a/test/unit/article_test.rb
+++ b/test/unit/article_test.rb
@@ -67,7 +67,7 @@ class ArticleTest < ActiveSupport::TestCase
   should 'act as taggable' do
     a = create(Article, :name => 'my article', :profile_id => profile.id)
     a.tag_list = ['one', 'two']
-    tags = a.tag_list.names
+    tags = a.tag_list
     assert tags.include?('one')
     assert tags.include?('two')
   end
@@ -746,7 +746,7 @@ class ArticleTest < ActiveSupport::TestCase
 
   should 'get tagged with tag' do
     a = create(Article, :name => 'Published at', :profile_id => profile.id, :tag_list => 'bli')
-    as = Article.find_tagged_with('bli')
+    as = Article.tagged_with('bli')
 
     assert_includes as, a
   end
@@ -758,7 +758,7 @@ class ArticleTest < ActiveSupport::TestCase
     user_from_other_environment = create_user('other_user', :environment => other_environment).person
     article_from_other_enviroment = create(Article, :profile => user_from_other_environment, :tag_list => 'bli')
 
-    tagged_articles_in_other_environment = other_environment.articles.find_tagged_with('bli')
+    tagged_articles_in_other_environment = other_environment.articles.tagged_with('bli')
 
     assert_includes tagged_articles_in_other_environment, article_from_other_enviroment
     assert_not_includes tagged_articles_in_other_environment, article_from_this_environment
@@ -859,16 +859,18 @@ class ArticleTest < ActiveSupport::TestCase
 
   should 'sanitize tags after save article' do
     article = fast_create(Article, :slug => 'article-with-tags', :profile_id => profile.id)
-    article.tags << build(Tag, :name => "TV Web w<script type='javascript'></script>")
-    assert_match /[<>]/, article.tags.last.name
+    tag = build(ActsAsTaggableOn::Tag, :name => "TV Web w<script type='javascript'></script>")
+    assert_match /[<>]/, tag.name
+    article.tag_list.add(tag.name)
     article.save!
     assert_no_match /[<>]/, article.tags.last.name
   end
 
   should 'strip HTML from tag names after save article' do
     article = fast_create(Article, :slug => 'article-with-tags', :profile_id => profile.id)
-    article.tags << build(Tag, :name => "TV Web w<script type=...")
-    assert_match /</, article.tags.last.name
+    tag = build(ActsAsTaggableOn::Tag, :name => "TV Web w<script type=...")
+    assert_match /</, tag.name
+    article.tag_list.add(tag.name)
     article.save!
     assert_no_match /</, article.tags.last.name
   end
diff --git a/test/unit/extended_tag_test.rb b/test/unit/extended_tag_test.rb
index ccb78ed..7311508 100644
--- a/test/unit/extended_tag_test.rb
+++ b/test/unit/extended_tag_test.rb
@@ -4,30 +4,30 @@ require 'extended_tag.rb'
 class UserTest < ActiveSupport::TestCase
 
   def test_find_without_pendings
-    tag1 = Tag.create(:name => 'pending_tag', :pending => true)
-    tag2 = Tag.create(:name => 'approved_tag', :pending => false)
-    assert_nothing_raised {Tag.find(tag2.id)}
-    assert_raise(ActiveRecord::RecordNotFound) {Tag.find(tag1.id)}
+    tag1 = ActsAsTaggableOn::Tag.create(:name => 'pending_tag', :pending => true)
+    tag2 = ActsAsTaggableOn::Tag.create(:name => 'approved_tag', :pending => false)
+    assert_nothing_raised {ActsAsTaggableOn::Tag.find(tag2.id)}
+    assert_raise(ActiveRecord::RecordNotFound) {ActsAsTaggableOn::Tag.find(tag1.id)}
   end
 
   def test_find_pendings
-    tag1 = Tag.create(:name => 'pending_tag', :pending => true)
-    tag2 = Tag.create(:name => 'approved_tag', :pending => false)
-    assert Tag.find_pendings.include?(tag1)
-    assert (not Tag.find_pendings.include?(tag2)) 
+    tag1 = ActsAsTaggableOn::Tag.create(:name => 'pending_tag', :pending => true)
+    tag2 = ActsAsTaggableOn::Tag.create(:name => 'approved_tag', :pending => false)
+    assert ActsAsTaggableOn::Tag.find_pendings.include?(tag1)
+    assert (not ActsAsTaggableOn::Tag.find_pendings.include?(tag2)) 
   end
 
   def test_parent_candidates
-    tag1 = Tag.create(:name => 'parent_tag')
-    tag2 = Tag.create(:name => 'child_tag', :parent_id => tag1.id)
+    tag1 = ActsAsTaggableOn::Tag.create(:name => 'parent_tag')
+    tag2 = ActsAsTaggableOn::Tag.create(:name => 'child_tag', :parent_id => tag1.id)
     assert ( not tag1.parent_candidates.include?(tag2) )
     assert tag2.parent_candidates.include?(tag1)
   end
 
   def test_descendents
-    tag1 = Tag.create(:name => 'parent_tag')
-    tag2 = Tag.create(:name => 'child_tag', :parent_id => tag1.id)
-    tag3 = Tag.create(:name => 'grand_tag', :parent_id => tag2.id)
+    tag1 = ActsAsTaggableOn::Tag.create(:name => 'parent_tag')
+    tag2 = ActsAsTaggableOn::Tag.create(:name => 'child_tag', :parent_id => tag1.id)
+    tag3 = ActsAsTaggableOn::Tag.create(:name => 'grand_tag', :parent_id => tag2.id)
     assert (not tag2.descendents.include?(tag1))
     assert (not tag1.descendents.include?(tag1))
     assert tag1.descendents.include?(tag2)
diff --git a/test/unit/profile_test.rb b/test/unit/profile_test.rb
index 10102ff..9826a03 100644
--- a/test/unit/profile_test.rb
+++ b/test/unit/profile_test.rb
@@ -285,9 +285,9 @@ class ProfileTest < ActiveSupport::TestCase
     second  = create(Article, :profile => profile, :tag_list => 'first-tag, second-tag')
     third   = create(Article, :profile => profile, :tag_list => 'first-tag, second-tag, third-tag')
 
-    assert_equivalent [ first, second, third], profile.find_tagged_with('first-tag')
-    assert_equivalent [ second, third ], profile.find_tagged_with('second-tag')
-    assert_equivalent [ third], profile.find_tagged_with('third-tag')
+    assert_equivalent [ first, second, third], profile.tagged_with('first-tag')
+    assert_equivalent [ second, third ], profile.tagged_with('second-tag')
+    assert_equivalent [ third], profile.tagged_with('third-tag')
   end
 
   should 'provide tag count' do
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/CHANGELOG b/vendor/plugins/acts_as_taggable_on_steroids/CHANGELOG
deleted file mode 100644
index 8c36852..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/CHANGELOG
+++ /dev/null
@@ -1,58 +0,0 @@
-[1 July 2007]
-
-* Fix incorrect tagging when the case of the tag list is changed.
-
-* Fix deprecated Tag.delimiter accessor.
-
-[23 June 2007]
-
-* Add validation to Tag model.
-
-* find_options_for_tagged_with should always return a hash.
-
-* find_tagged_with passing in no tags should return an empty array.
-
-* Improve compatibility with PostgreSQL.
-
-[21 June 2007]
-
-* Remove extra .rb from generated migration file name.
-
-[15 June 2007]
-
-* Introduce TagList class.
-
-* Various cleanups and improvements.
-
-* Use TagList.delimiter now, not Tag.delimiter. Tag.delimiter will be removed at some stage.
-
-[11 June 2007]
-
-* Restructure the creation of the options for find_tagged_with [Thijs Cadier]
-
-* Add an example migration with a generator.
-
-* Add caching.
-
-* Fix compatibility with Ruby < 1.8.6
-
-[23 April 2007]
-
-* Make tag_list to respect Tag.delimiter
-
-[31 March 2007]
-
-* Add Tag.delimiter accessor to change how tags are parsed.
-* Fix :include => :tags when used with find_tagged_with
-
-[7 March 2007]
-
-* Fix tag_counts for SQLServer [Brad Young]
-
-[21 Feb 2007]
-
-* Use scoping instead of TagCountsExtension [Michael Schuerig]
-
-[7 Jan 2007]
-
-* Add :match_all to find_tagged_with [Michael Sheakoski]
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/MIT-LICENSE b/vendor/plugins/acts_as_taggable_on_steroids/MIT-LICENSE
deleted file mode 100644
index 602bda2..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/MIT-LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2006 Jonathan Viney
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/README b/vendor/plugins/acts_as_taggable_on_steroids/README
deleted file mode 100644
index 670d13a..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/README
+++ /dev/null
@@ -1,116 +0,0 @@
-= acts_as_taggable_on_steroids
-
-If you find this plugin useful, please consider a donation to show your support!
-
-  http://www.paypal.com/cgi-bin/webscr?cmd=_send-money
-  
-  Email address: jonathan.viney@gmail.com
-  
-== Instructions
-
-This plugin is based on acts_as_taggable by DHH but includes extras
-such as tests, smarter tag assignment, and tag cloud calculations.
-
-Thanks to www.fanacious.com for allowing this plugin to be released. Please check out
-their site to show your support.
-
-== Resources
-
-Install
-  * script/plugin install http://svn.viney.net.nz/things/rails/plugins/acts_as_taggable_on_steroids
-
-== Usage
-
-=== Prepare database
-
-Generate and apply the migration:
-
-  ruby script/generate acts_as_taggable_migration
-  rake db:migrate
-
-=== Basic tagging
-
-Using the examples from the tests, let's suppose we have users that have many posts and we want those
-posts to be able to be tagged by the user.
-
-As usual, we add +acts_as_taggable+ to the Post class:
-
-  class Post < ActiveRecord::Base
-    acts_as_taggable
-    
-    belongs_to :user
-  end
-  
-We can now use the tagging methods provided by acts_as_taggable, <tt>tag_list</tt> and <tt>tag_list=</tt>. Both these
-methods work like regular attribute accessors.
-
-  p = Post.find(:first)
-  p.tag_list.to_s # ""
-  p.tag_list = "Funny, Silly"
-  p.save
-  p.reload.tag_list.to_s # "Funny, Silly"
-  
-You can also add or remove arrays of tags.
-
-  p.tag_list.add("Great", "Awful")
-  p.tag_list.remove("Funny")
-
-=== Finding tagged objects
-
-To retrieve objects tagged with a certain tag, use find_tagged_with.
-
-  Post.find_tagged_with('Funny, Silly')
-  
-By default, find_tagged_with will find objects that have any of the given tags. To
-find only objects that are tagged with all the given tags, use match_all.
-
-  Post.find_tagged_with('Funny, Silly', :match_all => true)
-
-=== Tag cloud calculations
-
-To construct tag clouds, the frequency of each tag needs to be calculated.
-Because we specified +acts_as_taggable+ on the <tt>Post</tt> class, we can
-get a calculation of all the tag counts by using <tt>Post.tag_counts</tt>. But what if we wanted a tag count for
-an single user's posts? To achieve this we call tag_counts on the association:
-
-  User.find(:first).posts.tag_counts
-  
-=== Caching
-
-It is useful to cache the list of tags to reduce the number of queries executed. To do this,
-add a column named <tt>cached_tag_list</tt> to the model which is being tagged.
-
-  class CachePostTagList < ActiveRecord::Migration
-    def self.up
-      # You should make sure that the column is long enough to hold
-      # the full tag list. In some situations the :text type may be more appropriate.
-      add_column :posts, :cached_tag_list, :string
-    end
-  end
-
-  class Post < ActiveRecord::Base
-    acts_as_taggable
-    
-    # The caching column defaults to cached_tag_list, but can be changed:
-    # 
-    # set_cached_tag_list_column_name "my_caching_column_name"
-  end
-
-The details of the caching are handled for you. Just continue to use the tag_list accessor as you normally would.
-Note that the cached tag list will not be updated if you directly create Tagging objects or manually append to the
-<tt>tags</tt> or <tt>taggings</tt> associations. To update the cached tag list you should call <tt>save_cached_tag_list</tt> manually.
-
-=== Delimiter
-
-If you want to change the delimiter used to parse and present tags, set TagList.delimiter.
-For example, to use spaces instead of commas, add the following to config/environment.rb:
-
-  TagList.delimiter = " "
-
-=== Other
-
-Problems, comments, and suggestions all welcome. jonathan.viney@gmail.com  
-  
-== Credits
-
-www.fanacious.com
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/Rakefile b/vendor/plugins/acts_as_taggable_on_steroids/Rakefile
deleted file mode 100644
index d2c0003..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/Rakefile
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the acts_as_taggable_on_steroids plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for the acts_as_taggable_on_steroids plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Acts As Taggable On Steroids'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/generators/acts_as_taggable_migration/acts_as_taggable_migration_generator.rb b/vendor/plugins/acts_as_taggable_on_steroids/generators/acts_as_taggable_migration/acts_as_taggable_migration_generator.rb
deleted file mode 100644
index be9b39c..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/generators/acts_as_taggable_migration/acts_as_taggable_migration_generator.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class ActsAsTaggableMigrationGenerator < Rails::Generator::Base 
-  def manifest 
-    record do |m| 
-      m.migration_template 'migration.rb', 'db/migrate' 
-    end 
-  end
-  
-  def file_name
-    "acts_as_taggable_migration"
-  end
-end
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/generators/acts_as_taggable_migration/templates/migration.rb b/vendor/plugins/acts_as_taggable_on_steroids/generators/acts_as_taggable_migration/templates/migration.rb
deleted file mode 100644
index ea0c2cc..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/generators/acts_as_taggable_migration/templates/migration.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-class ActsAsTaggableMigration < ActiveRecord::Migration
-  def self.up
-    create_table :tags do |t|
-      t.column :name, :string
-    end
-    
-    create_table :taggings do |t|
-      t.column :tag_id, :integer
-      t.column :taggable_id, :integer
-      
-      # You should make sure that the column created is
-      # long enough to store the required class names.
-      t.column :taggable_type, :string
-      
-      t.column :created_at, :datetime
-    end
-    
-    add_index :taggings, :tag_id
-    add_index :taggings, [:taggable_id, :taggable_type]
-  end
-  
-  def self.down
-    drop_table :taggings
-    drop_table :tags
-  end
-end
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/init.rb b/vendor/plugins/acts_as_taggable_on_steroids/init.rb
deleted file mode 100644
index 5d3aa8e..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/init.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require File.dirname(__FILE__) + '/lib/acts_as_taggable'
-
-require File.dirname(__FILE__) + '/lib/tagging'
-require File.dirname(__FILE__) + '/lib/tag'
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/lib/acts_as_taggable.rb b/vendor/plugins/acts_as_taggable_on_steroids/lib/acts_as_taggable.rb
deleted file mode 100644
index 0d424fe..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/lib/acts_as_taggable.rb
+++ /dev/null
@@ -1,145 +0,0 @@
-module ActiveRecord
-  module Acts #:nodoc:
-    module Taggable #:nodoc:
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-      
-      module ClassMethods
-        def acts_as_taggable(options = {})
-          has_many :taggings, :as => :taggable, :dependent => :destroy, :include => :tag
-          has_many :tags, :through => :taggings
-          
-          before_save :save_cached_tag_list
-          after_save :save_tags
-          
-          include ActiveRecord::Acts::Taggable::InstanceMethods
-          extend ActiveRecord::Acts::Taggable::SingletonMethods
-          
-          alias_method :reload_without_tag_list, :reload
-          alias_method :reload, :reload_with_tag_list
-        end
-        
-        def cached_tag_list_column_name
-          "cached_tag_list"
-        end
-        
-        def set_cached_tag_list_column_name(value = nil, &block)
-          define_attr_method :cached_tag_list_column_name, value, &block
-        end
-      end
-      
-      module SingletonMethods
-        # Pass either a tag string, or an array of strings or tags
-        # 
-        # Options:
-        #   :exclude - Find models that are not tagged with the given tags
-        #   :match_all - Find models that match all of the given tags, not just one
-        #   :conditions - A piece of SQL conditions to add to the query
-       def find_tagged_with(tags, options = {})
-          tags = TagList.from(tags).names
-          return [] if tags.empty?
-          
-          conditions = tags.map {|t| sanitize_sql(["tags.name LIKE ?",t])}.join(' OR ')
-          conditions += ' AND ' + sanitize_sql(options.delete(:conditions)) if options[:conditions]
-          group = "#{table_name}.id HAVING COUNT(#{table_name}.id) = #{tags.size}" if options.delete(:match_all)
-          exclude = options.delete(:exclude)
-          taggeds = find(:all, {:conditions => conditions, :include => :tags, :group => group}.update(options))
-          exclude ? find(:all) - taggeds : taggeds
-        end
-        
-        # Options:
-        #  :start_at - Restrict the tags to those created after a certain time
-        #  :end_at - Restrict the tags to those created before a certain time
-        #  :conditions - A piece of SQL conditions to add to the query
-        #  :limit - The maximum number of tags to return
-        #  :order - A piece of SQL to order by. Eg 'tags.count desc' or 'taggings.created_at desc'
-        #  :at_least - Exclude tags with a frequency less than the given value
-        #  :at_most - Exclude tags with a frequency greater then the given value
-        def tag_counts(*args)
-          Tag.find(:all, find_options_for_tag_counts(*args))
-        end
-
-	def find_options_for_tag_counts(options = {})
-          options.assert_valid_keys :start_at, :end_at, :conditions, :at_least, :at_most, :order, :limit
-
-          scope = scope(:find)
-          start_at = sanitize_sql(["#{Tagging.table_name}.created_at >= ?", options[:start_at]]) if options[:start_at]
-          end_at = sanitize_sql(["#{Tagging.table_name}.created_at <= ?", options[:end_at]]) if options[:end_at]
-          
-          conditions = [
-            "#{Tagging.table_name}.taggable_type = #{quote_value(base_class.name)}",
-            options[:conditions],
-            scope && scope[:conditions],
-            start_at,
-            end_at
-          ]
-          conditions = conditions.compact.join(' and ')
-          
-          at_least  = sanitize_sql(['COUNT(*) >= ?', options[:at_least]]) if options[:at_least]
-          at_most   = sanitize_sql(['COUNT(*) <= ?', options[:at_most]]) if options[:at_most]
-          having    = [at_least, at_most].compact.join(' and ')
-          group_by  = "#{Tag.table_name}.id, #{Tag.table_name}.name HAVING COUNT(*) > 0"
-          group_by << " AND #{having}" unless having.blank?
-          
-          { :select     => "#{Tag.table_name}.id, #{Tag.table_name}.name, COUNT(*) AS count", 
-            :joins      => "LEFT OUTER JOIN #{Tagging.table_name} ON #{Tag.table_name}.id = #{Tagging.table_name}.tag_id LEFT OUTER JOIN #{table_name} ON #{table_name}.#{primary_key} = #{Tagging.table_name}.taggable_id",
-            :conditions => conditions,
-            :group      => group_by,
-            :order      => options[:order],
-            :limit      => options[:limit]
-          }
-        end
-       end
-      
-      module InstanceMethods
-        def tag_list
-          if @tag_list
-            @tag_list
-          elsif caching_tag_list? and !send(self.class.cached_tag_list_column_name).nil?
-            @tag_list = TagList.from(send(self.class.cached_tag_list_column_name))
-          else
-            @tag_list = TagList.new(tags.map(&:name))
-          end
-        end
-        
-        def tag_list=(value)
-          @tag_list = TagList.from(value)
-        end
-        
-        def save_cached_tag_list
-          if caching_tag_list? and !tag_list.blank?
-            self[self.class.cached_tag_list_column_name] = tag_list.to_s
-          end
-        end
-        
-        def save_tags
-          return unless @tag_list
-          
-          new_tag_names = @tag_list.names - tags.map(&:name)
-          old_tags = tags.reject { |tag| @tag_list.names.include?(tag.name) }
-          
-          self.class.transaction do
-            tags.delete(*old_tags) if old_tags.any?
-            
-            new_tag_names.each do |new_tag_name|
-              tags << (Tag.find(:first, :conditions => ['name like ?',new_tag_name]) || Tag.create(:name => new_tag_name))
-            end
-          end
-          true
-        end
-
-        def reload_with_tag_list(*args)
-          @tag_list = nil
-          reload_without_tag_list(*args)
-        end
-        
-        def caching_tag_list?
-          self.class.column_names.include?(self.class.cached_tag_list_column_name)
-        end
-      end
-    end
-  end
-end
-
-ActiveRecord::Base.send(:include, ActiveRecord::Acts::Taggable)
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/lib/tag.rb b/vendor/plugins/acts_as_taggable_on_steroids/lib/tag.rb
deleted file mode 100644
index 78caf76..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/lib/tag.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-class Tag < ActiveRecord::Base  
-  has_many :taggings
-
-  attr_accessible :name
-  
-  validates_presence_of :name
-  validates_uniqueness_of :name
-  
-  class << self
-    delegate :delimiter, :delimiter=, :to => TagList
-  end
-  
-  def ==(object)
-    super || (object.is_a?(Tag) && name == object.name)
-  end
-  
-  def to_s
-    name
-  end
-  
-  def count
-    read_attribute(:count).to_i
-  end
-
-  def self.hierarchical=(bool)
-    if bool
-      acts_as_tree
-    end
-  end
-
-  # All the tags that can be a new parent for this tag, that is all but itself and its descendents to avoid loops
-  def parent_candidates
-    Tag.find_all_by_pending(false) - descendents - [self]
-  end
-  
-  # All tags that have this tag as its one of its ancestors
-  def descendents
-    children.to_a.sum([], &:descendents) + children 
-  end
-
-end
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/lib/tag_counts_extension.rb b/vendor/plugins/acts_as_taggable_on_steroids/lib/tag_counts_extension.rb
deleted file mode 100644
index 01defe0..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/lib/tag_counts_extension.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module TagCountsExtension
-end
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/lib/tag_list.rb b/vendor/plugins/acts_as_taggable_on_steroids/lib/tag_list.rb
deleted file mode 100644
index a227a21..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/lib/tag_list.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-class TagList
-  cattr_accessor :delimiter
-  self.delimiter = ','
-  
-  attr_reader :names
-  
-  def initialize(*names)
-    @names = []
-    add(*names)
-  end
-  
-  def add(*names)
-    names = names.flatten
-    
-    # Strip whitespace and remove blank or duplicate tags
-    names.map!(&:strip)
-    names.reject!(&:blank?)
-    
-    @names.concat(names)
-    @names.uniq!
-  end
-  
-  def remove(*names)
-    names = names.flatten
-    @names.delete_if { |name| names.include?(name) }
-  end
-  
-  def blank?
-    @names.empty?
-  end
-  
-  def to_s
-    @names.map do |name|
-      name.include?(delimiter) ? "\"#{name}\"" : name
-    end.join(delimiter.ends_with?(" ") ? delimiter : "#{delimiter} ")
-  end
-  
-  def ==(other)
-    super || (other.is_a?(TagList) && other.names == @names)
-  end
-  
-  class << self
-    def from(tags)
-    	case tags
-    		when String 
-    			new(parse(tags))
-    		when Array 
-    			new(tags.map(&:to_s))
-    		else
-    			new([])
-    	end
-    end
-    
-    def parse(string)
-      [].tap do |names|
-        string = string.to_s.dup
-        
-        # Parse the quoted tags
-        string.gsub!(/"(.*?)"\s*#{delimiter}?\s*/) { names << $1; "" }
-        string.gsub!(/'(.*?)'\s*#{delimiter}?\s*/) { names << $1; "" }
-        
-        names.concat(string.split(delimiter))
-      end
-    end
-  end
-end
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/lib/tagging.rb b/vendor/plugins/acts_as_taggable_on_steroids/lib/tagging.rb
deleted file mode 100644
index 33daf86..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/lib/tagging.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class Tagging < ActiveRecord::Base
-  belongs_to :tag
-  belongs_to :taggable, :polymorphic => true
-end
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/test/abstract_unit.rb b/vendor/plugins/acts_as_taggable_on_steroids/test/abstract_unit.rb
deleted file mode 100644
index 5b36d7b..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/test/abstract_unit.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-require 'test/unit'
-
-begin
-  require File.dirname(__FILE__) + '/../../../../config/environment'
-rescue LoadError
-  require 'rubygems'
-  require_gem 'activerecord'
-  require_gem 'actionpack'
-end
-
-# Search for fixtures first
-fixture_path = File.dirname(__FILE__) + '/fixtures/'
-begin
-  Dependencies.load_paths.insert(0, fixture_path)
-rescue
-  $LOAD_PATH.unshift(fixture_path)
-end
-
-require 'active_record/fixtures'
-
-require File.dirname(__FILE__) + '/../lib/acts_as_taggable'
-require_dependency File.dirname(__FILE__) + '/../lib/tag_list'
-
-ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + '/debug.log')
-#ActiveRecord::Base.configurations = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-#ActiveRecord::Base.establish_connection(ENV['DB'] || 'mysql')
-
-load(File.dirname(__FILE__) + '/schema.rb')
-
-Test::Unit::TestCase.fixture_path = fixture_path
-
-class Test::Unit::TestCase #:nodoc:
-  self.use_transactional_fixtures = true
-  self.use_instantiated_fixtures  = false
-  
-  def assert_equivalent(expected, actual, message = nil)
-    if expected.first.is_a?(ActiveRecord::Base)
-      assert_equal expected.sort_by(&:id), actual.sort_by(&:id), message
-    else
-      assert_equal expected.sort, actual.sort, message
-    end
-  end
-  
-  def assert_tag_counts(tags, expected_values)
-    # Map the tag fixture names to real tag names
-    expected_values = expected_values.inject({}) do |hash, (tag, count)|
-      hash[tags(tag).name] = count
-      hash
-    end
-    
-    tags.each do |tag|
-      value = expected_values.delete(tag.name)
-      assert_not_nil value, "Expected count for #{tag.name} was not provided" if value.nil?
-      assert_equal value, tag.count, "Expected value of #{value} for #{tag.name}, but was #{tag.count}"
-    end
-    
-    unless expected_values.empty?
-      assert false, "The following tag counts were not present: #{expected_values.inspect}"
-    end
-  end
-  
-  def assert_queries(num = 1)
-    $query_count = 0
-    yield
-  ensure
-    assert_equal num, $query_count, "#{$query_count} instead of #{num} queries were executed."
-  end
-
-  def assert_no_queries(&block)
-    assert_queries(0, &block)
-  end
-end
-
-ActiveRecord::Base.connection.class.class_eval do  
-  def execute_with_counting(sql, name = nil, &block)
-    $query_count ||= 0
-    $query_count += 1
-    execute_without_counting(sql, name, &block)
-  end
-  
-  alias_method_chain :execute, :counting
-end
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/test/acts_as_taggable_test.rb b/vendor/plugins/acts_as_taggable_on_steroids/test/acts_as_taggable_test.rb
deleted file mode 100644
index d8f3c09..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/test/acts_as_taggable_test.rb
+++ /dev/null
@@ -1,272 +0,0 @@
-require File.dirname(__FILE__) + '/abstract_unit'
-
-class ActsAsTaggableOnSteroidsTest < Test::Unit::TestCase
-  fixtures :tags, :taggings, :posts, :users, :photos
-  
-  def test_find_tagged_with
-    assert_equivalent [posts(:jonathan_sky), posts(:sam_flowers)], Post.find_tagged_with('"Very good"')
-    assert_equal Post.find_tagged_with('"Very good"'), Post.find_tagged_with(['Very good'])
-    assert_equal Post.find_tagged_with('"Very good"'), Post.find_tagged_with([tags(:good)])
-    
-    assert_equivalent [photos(:jonathan_dog), photos(:sam_flower), photos(:sam_sky)], Photo.find_tagged_with('Nature')
-    assert_equal Photo.find_tagged_with('Nature'), Photo.find_tagged_with(['Nature'])
-    assert_equal Photo.find_tagged_with('Nature'), Photo.find_tagged_with([tags(:nature)])
-    
-    assert_equivalent [photos(:jonathan_bad_cat), photos(:jonathan_dog), photos(:jonathan_questioning_dog)], Photo.find_tagged_with('"Crazy animal" Bad')
-    assert_equal Photo.find_tagged_with('"Crazy animal" Bad'), Photo.find_tagged_with(['Crazy animal', 'Bad'])
-    assert_equal Photo.find_tagged_with('"Crazy animal" Bad'), Photo.find_tagged_with([tags(:animal), tags(:bad)])
-  end
-  
-  def test_find_tagged_with_nothing
-    assert_equal [], Post.find_tagged_with("")
-    assert_equal [], Post.find_tagged_with([])
-  end
-  
-  def test_find_tagged_with_nonexistant_tags
-    assert_equal [], Post.find_tagged_with('ABCDEFG')
-    assert_equal [], Photo.find_tagged_with(['HIJKLM'])
-    assert_equal [], Photo.find_tagged_with([Tag.new(:name => 'unsaved tag')])
-  end
-  
-  def test_find_tagged_with_matching_all_tags
-    assert_equivalent [photos(:jonathan_dog)], Photo.find_tagged_with('Crazy animal, "Nature"', :match_all => true)
-    assert_equivalent [posts(:jonathan_sky), posts(:sam_flowers)], Post.find_tagged_with(['Very good', 'Nature'], :match_all => true)
-  end
-  
-  def test_find_tagged_with_exclusions
-    assert_equivalent [photos(:jonathan_questioning_dog), photos(:jonathan_bad_cat)], Photo.find_tagged_with("Nature", :exclude => true)
-    assert_equivalent [posts(:jonathan_grass), posts(:jonathan_rain)], Post.find_tagged_with("'Very good', Bad", :exclude => true)
-  end
-  
-#  def test_find_options_for_tagged_with_no_tags_returns_empty_hash
-#    assert_equal Hash.new, Post.find_options_for_tagged_with("")
-#    assert_equal Hash.new, Post.find_options_for_tagged_with([nil])
-#  end
-  
-#  def test_find_options_for_tagged_with_leavs_arguments_unchanged
-#    original_tags = photos(:jonathan_questioning_dog).tags.dup
-#    Photo.find_options_for_tagged_with(photos(:jonathan_questioning_dog).tags)
-#    assert_equal original_tags, photos(:jonathan_questioning_dog).tags
-#  end
-  
-#  def test_find_options_for_tagged_with_respects_custom_table_name
-#    Tagging.table_name = "categorisations"
-#    Tag.table_name = "categories"
-#    
-#    options = Photo.find_options_for_tagged_with("Hello")
-#    
-#    assert_no_match Regexp.new(" taggings "), options[:joins]
-#    assert_no_match Regexp.new(" tags "), options[:joins]
-#    
-#    assert_match Regexp.new(" categorisations "), options[:joins]
-#    assert_match Regexp.new(" categories "), options[:joins]
-#  ensure
-#    Tagging.table_name = "taggings"
-#    Tag.table_name = "tags"
-#  end
-  
-  def test_include_tags_on_find_tagged_with
-    assert_nothing_raised do
-      Photo.find_tagged_with('Nature', :include => :tags)
-      Photo.find_tagged_with("Nature", :include => { :taggings => :tag })
-    end
-  end
-  
-  def test_basic_tag_counts_on_class
-    assert_tag_counts Post.tag_counts, :good => 2, :nature => 5, :question => 1, :bad => 1
-    assert_tag_counts Photo.tag_counts, :good => 1, :nature => 3, :question => 1, :bad => 1, :animal => 3
-  end
-  
-  def test_tag_counts_on_class_with_date_conditions
-    assert_tag_counts Post.tag_counts(:start_at => Date.new(2006, 8, 4)), :good => 1, :nature => 3, :question => 1, :bad => 1
-    assert_tag_counts Post.tag_counts(:end_at => Date.new(2006, 8, 6)), :good => 1, :nature => 4, :question => 1
-    assert_tag_counts Post.tag_counts(:start_at => Date.new(2006, 8, 5), :end_at => Date.new(2006, 8, 8)), :good => 1, :nature => 2, :bad => 1
-    
-    assert_tag_counts Photo.tag_counts(:start_at => Date.new(2006, 8, 12), :end_at => Date.new(2006, 8, 17)), :good => 1, :nature => 1, :bad => 1, :question => 1, :animal => 2
-  end
-  
-  def test_tag_counts_on_class_with_frequencies
-    assert_tag_counts Photo.tag_counts(:at_least => 2), :nature => 3, :animal => 3
-    assert_tag_counts Photo.tag_counts(:at_most => 2), :good => 1, :question => 1, :bad => 1
-  end
-  
-  def test_tag_counts_with_limit
-    assert_equal 2, Photo.tag_counts(:limit => 2).size
-    assert_equal 1, Post.tag_counts(:at_least => 4, :limit => 2).size
-  end
-  
-  def test_tag_counts_with_limit_and_order
-    assert_equal [tags(:nature), tags(:good)], Post.tag_counts(:order => 'count desc', :limit => 2)
-  end
-  
-  def test_tag_counts_on_association
-    assert_tag_counts users(:jonathan).posts.tag_counts, :good => 1, :nature => 3, :question => 1
-    assert_tag_counts users(:sam).posts.tag_counts, :good => 1, :nature => 2, :bad => 1
-    
-    assert_tag_counts users(:jonathan).photos.tag_counts, :animal => 3, :nature => 1, :question => 1, :bad => 1
-    assert_tag_counts users(:sam).photos.tag_counts, :nature => 2, :good => 1
-  end
-  
-  def test_tag_counts_on_association_with_options
-    assert_equal [], users(:jonathan).posts.tag_counts(:conditions => '1=0')
-    assert_tag_counts users(:jonathan).posts.tag_counts(:at_most => 2), :good => 1, :question => 1
-  end
-  
-  def test_tag_counts_respects_custom_table_names
-    Tagging.table_name = "categorisations"
-    Tag.table_name = "categories"
-    
-    options = Photo.find_options_for_tag_counts(:start_at => 2.weeks.ago, :end_at => Date.today)
-    sql = options.values.join(' ')
-    
-    assert_no_match /taggings/, sql
-    assert_no_match /tags/, sql
-    
-    assert_match /categorisations/, sql
-    assert_match /categories/, sql
-  ensure
-    Tagging.table_name = "taggings"
-    Tag.table_name = "tags"
-  end
-  
-  def test_tag_list_reader
-    assert_equivalent ["Very good", "Nature"], posts(:jonathan_sky).tag_list.names
-    assert_equivalent ["Bad", "Crazy animal"], photos(:jonathan_bad_cat).tag_list.names
-  end
-  
-  def test_reassign_tag_list
-    assert_equivalent ["Nature", "Question"], posts(:jonathan_rain).tag_list.names
-    posts(:jonathan_rain).taggings.reload
-    
-    # Only an update of the posts table should be executed
-    assert_queries 1 do
-      posts(:jonathan_rain).update_attributes!(:tag_list => posts(:jonathan_rain).tag_list.to_s)
-    end
-    
-    assert_equivalent ["Nature", "Question"], posts(:jonathan_rain).tag_list.names
-  end
-  
-  def test_new_tags
-    assert_equivalent ["Very good", "Nature"], posts(:jonathan_sky).tag_list.names
-    posts(:jonathan_sky).update_attributes!(:tag_list => "#{posts(:jonathan_sky).tag_list}, One, Two")
-    assert_equivalent ["Very good", "Nature", "One", "Two"], posts(:jonathan_sky).tag_list.names
-  end
-  
-  def test_remove_tag
-    assert_equivalent ["Very good", "Nature"], posts(:jonathan_sky).tag_list.names
-    posts(:jonathan_sky).update_attributes!(:tag_list => "Nature")
-    assert_equivalent ["Nature"], posts(:jonathan_sky).tag_list.names
-  end
-  
-  def test_change_case_of_tags
-    original_tag_names = photos(:jonathan_questioning_dog).tag_list.names
-    photos(:jonathan_questioning_dog).update_attributes!(:tag_list => photos(:jonathan_questioning_dog).tag_list.to_s.upcase)
-    
-    # The new tag list is not uppercase becuase the AR finders are not case-sensitive
-    # and find the old tags when re-tagging with the uppercase tags.
-    assert_equivalent original_tag_names, photos(:jonathan_questioning_dog).reload.tag_list.names
-  end
-  
-  def test_remove_and_add_tag
-    assert_equivalent ["Very good", "Nature"], posts(:jonathan_sky).tag_list.names
-    posts(:jonathan_sky).update_attributes!(:tag_list => "Nature, Beautiful")
-    assert_equivalent ["Nature", "Beautiful"], posts(:jonathan_sky).tag_list.names
-  end
-  
-  def test_tags_not_saved_if_validation_fails
-    assert_equivalent ["Very good", "Nature"], posts(:jonathan_sky).tag_list.names
-    assert !posts(:jonathan_sky).update_attributes(:tag_list => "One, Two", :text => "")
-    assert_equivalent ["Very good", "Nature"], Post.find(posts(:jonathan_sky).id).tag_list.names
-  end
-  
-  def test_tag_list_accessors_on_new_record
-    p = Post.new(:text => 'Test')
-    
-    assert p.tag_list.blank?
-    p.tag_list = "One, Two"
-    assert_equal "One, Two", p.tag_list.to_s
-  end
-  
-  def test_clear_tag_list_with_nil
-    p = photos(:jonathan_questioning_dog)
-    
-    assert !p.tag_list.blank?
-    assert p.update_attributes(:tag_list => nil)
-    assert p.tag_list.blank?
-    
-    assert p.reload.tag_list.blank?
-  end
-  
-  def test_clear_tag_list_with_string
-    p = photos(:jonathan_questioning_dog)
-    
-    assert !p.tag_list.blank?
-    assert p.update_attributes(:tag_list => '  ')
-    assert p.tag_list.blank?
-    
-    assert p.reload.tag_list.blank?
-  end
-  
-  def test_tag_list_reset_on_reload
-    p = photos(:jonathan_questioning_dog)
-    assert !p.tag_list.blank?
-    p.tag_list = nil
-    assert p.tag_list.blank?
-    assert !p.reload.tag_list.blank?
-  end
-  
-  def test_tag_list_populated_when_cache_nil
-    assert_nil posts(:jonathan_sky).cached_tag_list
-    posts(:jonathan_sky).save!
-    assert_equal posts(:jonathan_sky).tag_list.to_s, posts(:jonathan_sky).cached_tag_list
-  end
-  
-  def test_cached_tag_list_used
-    posts(:jonathan_sky).save!
-    posts(:jonathan_sky).reload
-    
-    assert_no_queries do
-      assert_equivalent ["Very good", "Nature"], posts(:jonathan_sky).tag_list.names
-    end
-  end
-  
-  def test_cached_tag_list_not_used
-    # Load fixture and column information
-    posts(:jonathan_sky).taggings(:reload)
-    
-    assert_queries 1 do
-      # Tags association will be loaded
-      posts(:jonathan_sky).tag_list
-    end
-  end
-  
-  def test_cached_tag_list_updated
-    assert_nil posts(:jonathan_sky).cached_tag_list
-    posts(:jonathan_sky).save!
-    assert_equivalent ["Very good", "Nature"], TagList.from(posts(:jonathan_sky).cached_tag_list).names
-    posts(:jonathan_sky).update_attributes!(:tag_list => "None")
-    
-    assert_equal 'None', posts(:jonathan_sky).cached_tag_list
-    assert_equal 'None', posts(:jonathan_sky).reload.cached_tag_list
-  end
-
-  def test_inherited_taggable
-    # SpPost inherits acts_as_taggable from its ancestor Post
-    p = SpPost.new(:text => 'bla bla bla ...') 
-    p.tag_list = 'bla'
-    p.save
-    assert !SpPost.find_tagged_with('bla').blank?
-  end
-end
-
-class ActsAsTaggableOnSteroidsFormTest < Test::Unit::TestCase
-  fixtures :tags, :taggings, :posts, :users, :photos
-  
-  include ActionView::Helpers::FormHelper
-  
-  def test_tag_list_contents
-    fields_for :post, posts(:jonathan_sky) do |f|
-      assert_match /Very good, Nature/, f.text_field(:tag_list)
-    end
-  end
-end
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/test/database.yml b/vendor/plugins/acts_as_taggable_on_steroids/test/database.yml
deleted file mode 100644
index 0f484ae..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/test/database.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-mysql:
-  adapter: mysql
-  host: localhost
-  username: rails
-  password:
-  database: rails_plugin_test
-
-sqlite3:
-  adapter: sqlite3
-  database: ':memory:'
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/photo.rb b/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/photo.rb
deleted file mode 100644
index 224957f..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/photo.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class Photo < ActiveRecord::Base
-  acts_as_taggable
-  
-  belongs_to :user
-end
-
-class SpecialPhoto < Photo
-end
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/photos.yml b/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/photos.yml
deleted file mode 100644
index 25a4118..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/photos.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-jonathan_dog:
-  id: 1
-  user_id: 1
-  title: A small dog
-  
-jonathan_questioning_dog:
-  id: 2
-  user_id: 1
-  title: What does this dog want?
-  
-jonathan_bad_cat:
-  id: 3
-  user_id: 1
-  title: Bad cat
-  
-sam_flower:
-  id: 4
-  user_id: 2
-  title: Flower
-  
-sam_sky:
-  id: 5
-  user_id: 2
-  title: Sky
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/post.rb b/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/post.rb
deleted file mode 100644
index bee100a..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/post.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class Post < ActiveRecord::Base
-  acts_as_taggable
-  
-  belongs_to :user
-  
-  validates_presence_of :text
-end
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/posts.yml b/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/posts.yml
deleted file mode 100644
index d0cd9ac..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/posts.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-jonathan_sky:
-  id: 1
-  user_id: 1
-  text: The sky is particularly blue today
-  
-jonathan_grass:
-  id: 2
-  user_id: 1
-  text: The grass seems very green
-  
-jonathan_rain:
-  id: 3
-  user_id: 1
-  text: Why does the rain fall?
-  
-sam_ground:
-  id: 4
-  user_id: 2
-  text: The ground is looking too brown
-  
-sam_flowers:
-  id: 5
-  user_id: 2
-  text: Why are the flowers dead?
\ No newline at end of file
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/sp_post.rb b/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/sp_post.rb
deleted file mode 100644
index 5418a92..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/sp_post.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class SpPost < Post
-  def ihnerited
-    true
-  end
-end
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/taggings.yml b/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/taggings.yml
deleted file mode 100644
index b6eb440..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/taggings.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-jonathan_sky_good:
-  id: 1
-  tag_id: 1
-  taggable_id: 1
-  taggable_type: Post
-  created_at: 2006-08-01
-  
-jonathan_sky_nature:
-  id: 2
-  tag_id: 3
-  taggable_id: 1
-  taggable_type: Post
-  created_at: 2006-08-02
-  
-jonathan_grass_nature:
-  id: 3
-  tag_id: 3
-  taggable_id: 2
-  taggable_type: Post
-  created_at: 2006-08-03
-  
-jonathan_rain_question:
-  id: 4
-  tag_id: 4
-  taggable_id: 3
-  taggable_type: Post
-  created_at: 2006-08-04
-  
-jonathan_rain_nature:
-  id: 5
-  tag_id: 3
-  taggable_id: 3
-  taggable_type: Post
-  created_at: 2006-08-05
-
-sam_ground_nature:
-  id: 6
-  tag_id: 3
-  taggable_id: 4
-  taggable_type: Post
-  created_at: 2006-08-06
-  
-sam_ground_bad:
-  id: 7
-  tag_id: 2
-  taggable_id: 4
-  taggable_type: Post
-  created_at: 2006-08-07
-  
-sam_flowers_good:
-  id: 8
-  tag_id: 1
-  taggable_id: 5
-  taggable_type: Post
-  created_at: 2006-08-08
-  
-sam_flowers_nature:
-  id: 9
-  tag_id: 3
-  taggable_id: 5
-  taggable_type: Post
-  created_at: 2006-08-09
-  
-
-jonathan_dog_animal:
-  id: 10
-  tag_id: 5
-  taggable_id: 1
-  taggable_type: Photo
-  created_at: 2006-08-10
-  
-jonathan_dog_nature:
-  id: 11
-  tag_id: 3
-  taggable_id: 1
-  taggable_type: Photo
-  created_at: 2006-08-11
-  
-jonathan_questioning_dog_animal:
-  id: 12
-  tag_id: 5
-  taggable_id: 2
-  taggable_type: Photo
-  created_at: 2006-08-12
-  
-jonathan_questioning_dog_question:
-  id: 13
-  tag_id: 4
-  taggable_id: 2
-  taggable_type: Photo
-  created_at: 2006-08-13
-  
-jonathan_bad_cat_bad:
-  id: 14
-  tag_id: 2
-  taggable_id: 3
-  taggable_type: Photo
-  created_at: 2006-08-14
-  
-jonathan_bad_cat_animal:
-  id: 15
-  tag_id: 5
-  taggable_id: 3
-  taggable_type: Photo
-  created_at: 2006-08-15
-  
-sam_flower_nature:
-  id: 16
-  tag_id: 3
-  taggable_id: 4
-  taggable_type: Photo
-  created_at: 2006-08-16
-  
-sam_flower_good:
-  id: 17
-  tag_id: 1
-  taggable_id: 4
-  taggable_type: Photo
-  created_at: 2006-08-17
-  
-sam_sky_nature:
-  id: 18
-  tag_id: 3
-  taggable_id: 5
-  taggable_type: Photo
-  created_at: 2006-08-18
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/tags.yml b/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/tags.yml
deleted file mode 100644
index b8f8367..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/tags.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-good:
-  id: 1
-  name: Very good
-  
-bad:
-  id: 2
-  name: Bad
-  
-nature:
-  id: 3
-  name: Nature
-  
-question:
-  id: 4
-  name: Question
-  
-animal:
-  id: 5
-  name: Crazy animal
\ No newline at end of file
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/user.rb b/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/user.rb
deleted file mode 100644
index c85a292..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/user.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class User < ActiveRecord::Base
-  has_many :posts
-  has_many :photos
-end
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/users.yml b/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/users.yml
deleted file mode 100644
index da94fea..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/users.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-jonathan:
-  id: 1
-  name: Jonathan
-  
-sam:
-  id: 2
-  name: Sam
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/test/schema.rb b/vendor/plugins/acts_as_taggable_on_steroids/test/schema.rb
deleted file mode 100644
index 89680c0..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/test/schema.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-ActiveRecord::Schema.define :version => 0 do
-  create_table :tags, :force => true do |t|
-    t.column :name, :string
-    t.column :parent_id, :integer
-    t.column :pending, :boolean
-  end
-  
-  create_table :taggings, :force => true do |t|
-    t.column :tag_id, :integer
-    t.column :taggable_id, :integer
-    t.column :taggable_type, :string
-    t.column :created_at, :datetime
-  end
-  
-  create_table :users, :force => true do |t|
-    t.column :name, :string
-  end
-  
-  create_table :posts, :force => true do |t|
-    t.column :text, :text
-    t.column :cached_tag_list, :string
-    t.column :user_id, :integer
-
-    t.column :type, :string
-  end
-  
-  create_table :photos, :force => true do |t|
-    t.column :title, :string
-    t.column :user_id, :integer
-  end
-end
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/test/tag_list_test.rb b/vendor/plugins/acts_as_taggable_on_steroids/test/tag_list_test.rb
deleted file mode 100644
index 58b2216..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/test/tag_list_test.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-require File.dirname(__FILE__) + '/abstract_unit'
-
-class TagListTest < Test::Unit::TestCase
-  def test_blank?
-    assert TagList.new.blank?
-  end
-  
-  def test_equality
-    assert_equal TagList.new, TagList.new
-    assert_equal TagList.new("tag"), TagList.new("tag")
-    
-    assert_not_equal TagList.new, ""
-    assert_not_equal TagList.new, TagList.new("tag")
-  end
-  
-  def test_parse_leaves_string_unchanged
-    tags = '"one  ", two'
-    original = tags.dup
-    TagList.parse(tags)
-    assert_equal tags, original
-  end
-  
-  def test_from_single_name
-    assert_equal %w(fun), TagList.from("fun").names
-    assert_equal %w(fun), TagList.from('"fun"').names
-  end
-  
-  def test_from_blank
-    assert_equal [], TagList.from(nil).names
-    assert_equal [], TagList.from("").names
-  end
-  
-  def test_from_single_quoted_tag
-    assert_equal ['with, comma'], TagList.from('"with, comma"').names
-  end
-  
-  def test_spaces_do_not_delineate
-    assert_equal ['a b', 'c'], TagList.from('a b, c').names
-  end
-  
-  def test_from_multiple_tags
-    assert_equivalent %w(alpha beta delta gamma), TagList.from("alpha, beta, delta, gamma").names.sort
-  end
-  
-  def test_from_multiple_tags_with_quotes
-    assert_equivalent %w(alpha beta delta gamma), TagList.from('alpha,  "beta",  gamma , "delta"').names.sort
-  end
-  
-  def test_from_multiple_tags_with_quote_and_commas
-    assert_equivalent ['alpha, beta', 'delta', 'gamma, something'], TagList.from('"alpha, beta", delta, "gamma, something"').names
-  end
-  
-  def test_from_removes_white_space
-    assert_equivalent %w(alpha beta), TagList.from('" alpha   ", "beta  "').names
-    assert_equivalent %w(alpha beta), TagList.from('  alpha,  beta ').names
-  end
-  
-  def test_alternative_delimiter
-    TagList.delimiter = " "
-    
-    assert_equal %w(one two), TagList.from("one two").names
-    assert_equal ['one two', 'three', 'four'], TagList.from('"one two" three four').names
-  ensure
-    TagList.delimiter = ","
-  end
-  
-  def test_duplicate_tags_removed
-    assert_equal %w(one), TagList.from("one, one").names
-  end
-  
-    def test_to_s_with_commas
-    assert_equal "question, crazy animal", TagList.new(["question", "crazy animal"]).to_s
-  end
-  
-  def test_to_s_with_alternative_delimiter
-    TagList.delimiter = " "
-    
-    assert_equal '"crazy animal" question', TagList.new(["crazy animal", "question"]).to_s
-  ensure
-    TagList.delimiter = ","
-  end
-  
-  def test_add
-    tag_list = TagList.new("one")
-    assert_equal %w(one), tag_list.names
-    
-    tag_list.add("two")
-    assert_equal %w(one two), tag_list.names
-  end
-  
-  def test_remove
-    tag_list = TagList.new("one", "two")
-    assert_equal %w(one two), tag_list.names
-    
-    tag_list.remove("one")
-    assert_equal %w(two), tag_list.names
-  end
-end
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/test/tag_test.rb b/vendor/plugins/acts_as_taggable_on_steroids/test/tag_test.rb
deleted file mode 100644
index e383103..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/test/tag_test.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require File.dirname(__FILE__) + '/abstract_unit'
-
-class TagTest < Test::Unit::TestCase
-  fixtures :tags, :taggings, :users, :photos, :posts
-  
-  def test_name_required
-    t = Tag.create
-    assert_match /blank/, t.errors[:name].to_s
-  end
-  
-  def test_name_unique
-    t = Tag.create!(:name => "My tag")
-    duplicate = t.clone
-    
-    assert !duplicate.save
-    assert_match /taken/, duplicate.errors[:name].to_s
-  end
-  
-  def test_taggings
-    assert_equivalent [taggings(:jonathan_sky_good), taggings(:sam_flowers_good), taggings(:sam_flower_good)], tags(:good).taggings
-    assert_equivalent [taggings(:sam_ground_bad), taggings(:jonathan_bad_cat_bad)], tags(:bad).taggings
-  end
-  
-  def test_to_s
-    assert_equal tags(:good).name, tags(:good).to_s
-  end
-  
-  def test_equality
-    assert_equal tags(:good), tags(:good)
-    assert_equal Tag.find(1), Tag.find(1)
-    assert_equal Tag.new(:name => 'A'), Tag.new(:name => 'A')
-    assert_not_equal Tag.new(:name => 'A'), Tag.new(:name => 'B')
-  end
-  
-  def test_deprecated_delimiter
-    original_delimiter = Tag.delimiter
-    Tag.delimiter = ":"
-    assert_equal ":", TagList.delimiter
-  ensure
-    TagList.delimiter = original_delimiter
-  end
-end
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/test/tagging_test.rb b/vendor/plugins/acts_as_taggable_on_steroids/test/tagging_test.rb
deleted file mode 100644
index 172b8e2..0000000
--- a/vendor/plugins/acts_as_taggable_on_steroids/test/tagging_test.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require File.dirname(__FILE__) + '/abstract_unit'
-
-class TaggingTest < Test::Unit::TestCase
-  fixtures :tags, :taggings, :posts
-  
-  def test_tag
-    assert_equal tags(:good), taggings(:jonathan_sky_good).tag
-  end
-  
-  def test_taggable
-    assert_equal posts(:jonathan_sky), taggings(:jonathan_sky_good).taggable
-  end
-end
--
libgit2 0.21.2