Sync changes from "stoney" to "master"

> I have set it to #!/usr/bin/env ruby

@tboerger: Where? I don't see that in stoney (nor roxy).