* update option parser
* didn't add tests b/c i'm not using rvm and can't see an easy way to add commandline option parsing tests

Add configurable for routes position, ability to remove routes, fix handling of output from newer Rake versions.

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

Because my editor is set to do whitespace cleanup on write

see http://github.com/branch14/annotate_models/commit/e51c3418ca67fc4e833d31db52f440f8d0e0d3b5

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

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!)

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