Updated dependencies, first move towards httparty
More refactoring