* nofxx/master:
  add simple_indexes option
  added blueprints/* dir
  annotate exemplars with unit tests added
  lil fix and v bump
  defaults to after the code
  jeweler!!
  merge IPGlider nice patches
  Now -p option also have effect on test, spec and Object Daddy files.
  Write default(FALSE) when the default value for a column is false.
  dont add whitespace on routes, and some minor stuff
  handle errors when not in a rails folder
  Organize the code better/adds some tests
  clean up hoe stuff
  forgot gemspec
  More lil fixes
  some fixes
  big commit..

* Now using jeweler
* Rev version to 2.4 and get ready for big release

* zapnap/master:
  correct rake task name
  add auto-annotate magic for ActiveRecord migrations in Rails

* jacqui/master:
  Pass options to annotate_one_file for specs/tests/exemplars as well

Refactoring & making work with Neal's 'exclude' option too.

Merge branch 'master' of git://github.com/nclark/annotate_models

* 'master' of git://github.com/nclark/annotate_models:
  adding option to not annotate tests or fixtures

* 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>