This reverts commit 8d3c00c7.

Sorry, but database order should be the default unless a user really wants it alphabetized. (We should also allow a .annotate file so users can set their own preferred options more easily.)

Conflicts:

	.gitignore
	bin/annotate
	lib/annotate/annotate_models.rb
	lib/tasks/annotate_models.rake

Annotation position defaulted to 'before'. Bugfix: annotate_models.rake uses string instead of symbol.

Fix options parsing to convert strings to proper booleans. Change annotate to use options hash instead of ENV.

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

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.

Signed-off-by: ctran <ctran@pragmaquest.com>

added '-R' option to require additional files
ignore unknown macros ('acts_as_whatever') (with specs!)

use model_dir parameter in remove_annotation as well; remove obsolete (and confusing) annotate.rake file

fix the dependencies so it doesn't fail when multiple version of Rails is installed, reported by kuroda