Accept empty responses
Merge pull request #158 from alfonsocora/accept_empty_responses

Add option to accept empty responses
Merge pull request #156 from yozlet/fix_rspec_deprecations

Fix deprecation warnings with RSpec 2.14
Merge branch 'master' of github.com:remiprev/her

Conflicts:
	lib/her/middleware/parse_json.rb