added some examples for the Accept-Encoding header
moved accept header parsing to a slightly better place
detect whether gzip is an accepted and preferred content encoding
Added a test for anorm
changed things as requested by pull request review
Add note about scalariform to contributor guidelines
[#826] Make Promise.{flat,}map allow supertypes
Merge pull request #1989 from asflierl/1983_correctly_handle_accept_encoding_gzip

correctly handle accept encoding gzip
Merge pull request #1992 from jroper/anorm-tests

Added a test for anorm
Merge pull request #1998 from baloo/improvements/826-Promise.flatMap

[#826] Make Promise.{flat,}map allow supertypes
Merge pull request #1995 from dylex/scalariformdoc

Add note about scalariform to contributor guidelines
Enabled some tracing in an attempt to diagnose the intermittent CI issue we’re now getting.
The main motivation for this change is that Bonecp connection tracking appears to closing a connection that has not been checked back in. See https://playframework2.ci.cloudbees.com/job/play2-master/1420/consoleFull and search for “disableConnectionTracking” and you’ll see that jdbc[4]’s connection is closed. Tracing back from there the connection for jdbc[4] does not appear to have been checked out (also verified by looking at the source code that should call the check in). It appears to me that the connection should remain open given that it is part of the pool.

Interestingly this problem is intermittent on master, doesn’t occur on the PR validation branch and I cannot reproduce it locally. Perhaps a race condition within BoneCP?

The secondary motivation to this change is that connections do not require management by BoneCP in a situation where they are being managed by a framework such as Play. The BoneCP management will add overhead so not requiring it by default may improve performance.
Merge pull request #2009 from huntc/disableConnectionTracking

Enabled disableConnectionTracking option for Bonecp
Merge remote-tracking branch: upstream/master