Inserting newline requires double-quoted string
Updating authorship.
Merge pull request #76 from ffmike/master

Fixed a bug in "after" annotations
add rubygems source to Gemfile
update History.txt with recent major features and fixes
clean up some config and documentation
clean up some config and documentation
add some names to invite to the mailing list
Merge branch 'ctran'

* ctran: (23 commits)
  Inserting newline requires double-quoted string
  Annotation position defaulted to 'before'. Bugfix: annotate_models.rake uses string instead of symbol.
  include ActiveSupport to finish build #45
  include lib specs
  specify :rubygems source in Gemfile for Travis
  Gemfile for dependencies for Travis CI rake
  make the specs pass (one pending)
  fix column pattern
  Allow task loading from Rakefile for gems (plugin installation already auto-detects). Add skip_on_db_migrate option as well for people that don't want it.
  Fix options parsing to convert strings to proper booleans. Change annotate to use options hash instead of ENV.
  Update README.rdoc to mention Fabrication support
  Add support for Fabrication fabricators
  We had stripped the trailing newlines from our Schema Information section. This small fix supports that case.
  rake task is 'build', not 'gem'
  match indexes and column options too when comparing annotation headers
  Leave magic encoding comment intact
  Fixes issue #14 - RuntimeError: Already memoized
  Count a model as 'annotated' if any of its tests/fixtures are annotated
  Implement FactoryGirl (#47)
  fix gemspec and get rspecs partly working again
  ...

Conflicts:
	Gemfile
	Rakefile
	VERSION.yml
	annotate.gemspec
	lib/tasks/annotate_models.rake
	spec/annotate/annotate_models_spec.rb
	spec/spec_helper.rb
update history with recent patches
Merge branch 'mrjoy'

* mrjoy: (177 commits)
  Updating authorship.
  Resolve conflict between generated rakefile and CLI tool.
  Minor fixups.
  Updating readme to be RDoc compliant.
  fixed a few typos
  Updating docs to point to this fork.
  Update docs.
  Yep, I'm tired.
  Revert "Version bump to 0.0.0"
  Version bump to 0.0.0
  Changing my mind on project name issue...
  Making project name match Github project name.
  Bumping version.
  Wider type column output, play nice with Rake CLI.
  Fixing behavior with some model sub-classes, adding skip-annotations feature.
  Making ActiveSupport dependency float, updating gemspec.
  Updating change log, readme and TODO list.
  Update generated .rake file with new options.
  Renaming bin to avoid conflict with ImageMagick.
  Accept string or symbol for positions.
  ...

Conflicts:
	Gemfile
	Gemfile.lock
	History.txt
	README.rdoc
	Rakefile
	VERSION.yml
	annotate.gemspec
	annotate_models.gemspec
	lib/annotate/annotate_models.rb
	lib/tasks/annotate_models.rake
	lib/tasks/annotate_routes.rake
	spec/annotate/annotate_models_spec.rb
	spec/spec_helper.rb
	todo.txt
move version out of VERSION.yml and into version.rb (to remove yaml dependency and some messy code)
fix up readme
remove .rvmrc since it's in .gitignore now, and we use bundler anyway
Let versions float.
Whoops, infinite loop. >.<

This may break things in other cases, but fixes Rails 3 when combined with an updated .rake file.
Rails isn't loading our tasks?
Hoisting this to where it belongs.
Updating gemspec.
Whoops, got ahead of myself.