Update to OkHttp 2.0 final
Misc updates