Add httparty to gemfile
fix conflicts
Merge branch 'master' into sarah
Clean version