Adds httparty gem
Fixes merge conflicts