Ignore files ending in ~.
Merge 0d7c5946a8f81a32725e2ed8a5fdffbcfb9d4948
activerecord >~ 4
Meh, merge wasn't cleaned.