Added maxBitsPerSecond parameter to the REST API method
Merge pull request #88 from roydekleijn/master

Added maxBitsPerSecond parameter to the REST API method
Add capability to disable the capture of binary contents (eg : video,
audio, images...).
Javascript, XML, JSON contents are now considered as text contents
(there is no more Base 64 encoding on these ones)
Added timeout REST API method, to allow setting different timeouts.
Merge pull request #89 from roydekleijn/master

Added timeout REST API method, to allow setting different timeouts.
Merge pull request #91 from d-jubeau/master

 Add capability to disable the capture of binary contents
Added binarycontent parameter to REST API
Added retry count REST API method
clearDnsCache API method
Merge pull request #99 from roydekleijn/binarycontent

Added binarycontent parameter to REST API
Added rewrite url method
Merge pull request #100 from roydekleijn/retry

Added retry count REST API method
Merge branch 'rewrite' of git://github.com/roydekleijn/browsermob-proxy into roydekleijn-rewrite

Conflicts:
	README.md
	src/main/java/org/browsermob/proxy/bricks/ProxyResource.java
Merge branch 'cleardns' of git://github.com/roydekleijn/browsermob-proxy into roydekleijn-cleardns

Conflicts:
	README.md
Merge branch 'cleardns' of git://github.com/roydekleijn/browsermob-proxy into roydekleijn-cleardns

Conflicts:
	README.md
Reverts #16 and provides simpler cookie capture logic, backed by actual unit tests this time. Fixes #104 and #43
Possible fix for issues reported by Simon Sadedin
will now fall back to getHostName if getHostString isn't public
upgraded to HttpClient 4.2.x so that we can get the host name out directly from HttpInetSocketAddress rather than going through some crazy reflection craziness. That code is still in place just in case it's necessary, but I am 99% sure it's not needed.
Fix link in readme