Some cleanup + upgrade httparty.

Our app needs a newer version of httparty to meet another dependency.