removed *~ files
replaced named_scope with scope for Rails 3