vanilla will now report ip addresses correctly on pagodabox
pulled in merge