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

Conflicts:
	annotate.gemspec

Fixed that schema kept prepending additional newlines

Prior to this patch every time the schema was regenerated at the end of
the file it prepended an additional newline character. This made the
schema slowly creep down the file over time. Finally annoyed me enough
to fork and fix ;)

Updates to make annotate smarter about when to touch a model

Compatibility patch

Specify Development dependencies

Recognize column+type, and don't change a file unless the column+type combination of the new schema are different than that of the old (i.e., don't regenerate if columns happen to be in a different order. That's just how life is sometimes)
Grab old specification even if it has \r\n as line endings rather than pure \ns
Remove gemspec line causing a warning

fix for require statements in tasks

Change to replace schema annotation in-place if it's already in the model file

model file, it will be replaced into the same location.  If it didn't
previously exist, it'll be placed according to the "position", as before.

* 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