use model_dir parameter in remove_annotation as well; remove obsolete (and confusing) annotate.rake file