Conflicts:
	annotate.gemspec
	bin/annotate
	lib/annotate/annotate_models.rb

Conflicts:
	.gitignore

Conflicts:
	lib/annotate/annotate_models.rb

Conflicts:
	lib/annotate_models.rb

Conflicts:
	annotate_models.gemspec
	bin/annotate
	lib/annotate/annotate_models.rb
	lib/tasks/annotate.rake

... I am clearly tired.

This reverts commit 192808b7.

WARNING: EVIL MERGE.

I'm fixing a number of problems with this branch and ommitting one or two things.


Conflicts:
	.gitignore
	History.txt
	README.rdoc
	Rakefile
	VERSION.yml
	annotate.gemspec
	lib/annotate/annotate_models.rb
	lib/tasks/annotate_models.rake
	lib/tasks/annotate_routes.rake
	lib/tasks/migrate.rake
	spec/annotate/annotate_models_spec.rb
	spec/spec_helper.rb

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.