* 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