WARNING: EVIL MERGE.

I'm fixing a number of problems with this branch and ommitting one or two things.


Conflicts:
	.gitignore
	History.txt
	README.rdoc
	Rakefile
	VERSION.yml
	annotate.gemspec
	lib/annotate/annotate_models.rb
	lib/tasks/annotate_models.rake
	lib/tasks/annotate_routes.rake
	lib/tasks/migrate.rake
	spec/annotate/annotate_models_spec.rb
	spec/spec_helper.rb