WARNING: EVIL MERGE!

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

Conflicts:

	annotate.gemspec
	lib/annotate/annotate_models.rb

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.

issue 36 fix: warn about macros, to mitigate when we're included during a production run, not just a rakefile run -- possibly at the expense of too much noise

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

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

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

tagging 2.2.2

* update gem with newgem
Add my plugin addons:
* annotate geometrical columns
* annotate object daddy
* annotate spec models
Annotates in the end by default.