Shazam!

Merged in my commits from the time I moved to Rails onward.