Conflicts:
	README.rdoc

WARNING: EVIL MERGE!

I had to update the test cases to match the current reality...

Conflicts:

	annotate.gemspec
	lib/annotate/annotate_models.rb

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

Conflicts:
	lib/annotate/annotate_models.rb

Conflicts:
	lib/tasks/annotate_models.rake
	lib/tasks/annotate_routes.rake

Conflicts:
	annotate.gemspec

(NOTE: Unfinished.  Will replace rakefile in next commit.)

Conflicts:
	annotate.gemspec

This approach eliminates necessity to guess model name by file name that
allow to process models with any kind of non-standard capitalization in
class and module names. Though, it still requires that underscored file
name matches underscored model class name. If file is located not at the
top level of models directory then we assume that model is either nested
in the corresponding chain of modules or is not nested at all.

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

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

fix column pattern regex

Allow task loading from Rakefile for gems (by ijcd)

Options parsing should dig booleans from ENV

Add support for Fabrication fabricators (by ijcd)

Allow task loading from Rakefile for gems (plugin installation already auto-detects). Add skip_on_db_migrate option as well for people that don't want it.

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