Conflicts:
	annotate.gemspec

Conflicts:
	lib/annotate/annotate_models.rb
	spec/annotate/annotate_models_spec.rb

Conflicts:
	lib/annotate/annotate_models.rb
	spec/annotate/annotate_models_spec.rb

Conflicts:
	History.txt
	annotate.gemspec
	lib/annotate/annotate_models.rb

Conflicts:
	History.txt
	annotate.gemspec
	lib/annotate/annotate_models.rb

Conflicts:
	annotate.gemspec
	spec/annotate/annotate_models_spec.rb

Changing between sqlite and mysql causes schema info to change for
integers.  This is needless noise.

Add support for factory_girl and move default annotation position to top.  Also updated documentation files.

Remove require 'rubygems', gem calls (they make the gem unusable outside of rubygems - rubygems should be in RUBY_OPT)

option to control if should run annotate on db:migrate. Only tested with annotate_models as a plugin, not as a gem.

To control this option in your rails environment declare a module ANNOTATE_MODELS_PREFS with the constant UPDATE_ON_MIGRATE = false

In your rails env define module ANNOTATE_MODELS_PREFS with a constant of USE_PLUGIN = true to use plugin not gem

Add support for factory_girl and move default annotation position to top.  Also updated documentation files.