WARNING: EVIL MERGE! I had to update the test cases to match the current reality... Conflicts: annotate.gemspec lib/annotate/annotate_models.rb
