Fix tests
Move httparty from dev dependency to a dependency
Merge branch 'master' of github.com:EdeyaLabs/coordsafe_api

Conflicts:
	Gemfile.lock
	coordsafe_api.gemspec
	spec/coordsafe_api/coordsafe_api_spec.rb
	spec/coordsafe_api/v1/locator_spec.rb