* git://github.com/ctran/annotate_models:
  not continually prepending newlines.
  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
  Explicitly require rake, fixing rake version compatibility
  Adding rake as a runtime dependency
  Correct homepage link to github project
  Specify development dependencies and ensure correct loading of test libraries
  Modify the model annontator so that if the schema is already in the 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.
  Updated require statements in tasks to use full path to lib files.

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