Fix mocha warning
Recent versions of webmock can return a nil body
Handle URI changes from 1.8.7, 1.9.3 and 2.0.0
Fix various warnings