Some of these new files have a extra whitespace all over the place, any chance you could tidy the whitespace a bit? Most ruby devs have their editors configured to automatically trim trailing whitespace.

How you go about that depends on your editor, take a look at http://makandracards.com/makandra/11541-don-t-leave-trailing-whitespace or google $YOUR_EDITOR remove whitespace