* commit 'alex/master':
  expand path (to help prevent double-require warnings)
  cleaned up options specifications

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

* commit 'ctran/v2_0_2':
  upgrade to newgem 1.3

Conflicts:
	lib/tasks/annotate.rake
	lib/tasks/annotate_models.rake
	test/test_helper.rb

* git://github.com/bpot/annotate_models:
  Add options for show indexes in annotations

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

A class named Approval in moderations/approval.rb raises no error
Signed-off-by: ctran <ctran@pragmaquest.com>

Before this change only default(TRUE) was written.

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

Fix a bug where options are not passed when annotating tests/specs.

tagging 2.2.2

Adds compat mode for annotate plugin version
Tim Charper binary write mode back
Updates history