Made json and multipart options coexist
Test combining of formData and multipart with json:true
Merge branch 'json-multipart' of github.com:simov/request into simov-json-multipart
Run form-data and multipart tests both with and without JSON
Merge pull request #1216 from simov/json-multipart

Made json and multipart options coexist