Merge remote-tracking branch 'james2m/master'

.gitignore

@@ -4,3 +4,4 @@ rdoc/*
 coverage/*
 spec/debug.log
 pkg/*
+*.gem

Rakefile

 require 'rubygems'
+require 'rake/dsl_definition'
 require 'rake'
 
 # want other tests/tasks run by default? Add them to the list

bin/annotate

@@ -2,6 +2,8 @@
 
 require 'optparse'
 require 'annotate'
+require 'rake/dsl_definition'
+require 'rake'
 
 task = :annotate_models