Rails3 cleanup

@gvarela would like you to look at this, especially 4145bfe. not sure how these passed before but I think this was your intent with the specs.