Fixed Typo and marked ThreadLocals like other real classes
enhanced formatting in ThreadPools.md
Update ThreadPools.md
Fix hardcoded reference to conf directory when loading config file
Use Anorm RowParser directly
Merge pull request #3679 from cchantep/anorm-3679

Use Anorm RowParser directly
Merge pull request #3678 from benmccann/conf-load-hardcoded

Fix hardcoded reference to conf directory when loading config file
Remove unused SbtOptionalThrowableExtractor
Merge pull request #3683 from benmccann/remove-optional-throwable-extractor

Remove unused SbtOptionalThrowableExtractor
Remove portion of message that says it's running from SBT. The application has no idea if that's true. In particular Gradle is now starting to support running Play applications and this message is very confusing when run from Gradle
Make WSRequestHolder#withRequestTimeout accept Long
Merge pull request #3685 from benmccann/running-app-message

Remove portion of message that says application is running from SBT
Merge pull request #3622 from gmethvin/ws-request-timeout

Signature for def withRequestTimeout(timeout: Int)
Merge pull request #3596 from domdorn/patch-1

Enhanced formatting and marked ThreadLocals like other real classes
Make Cached work with DI and on-disk caches

* Update Cached to use DI. To make this work, I change the old Cached
  class into CachedBuilder. Then I introduce a new Cached class which
  has the same API as the old Cached companion object.
* Make Results serializable by wrapping them before storing them
  in Cached's cache. This allows Cached to work with on-disk caches,
  not just in-memory caches.
Fix omnidoc snapshot check to use play version
Move overrides of directory layout defaults to an SBT auto plugin, so that we have the option of turning off the overrides and using the default SBT directory layout
Make JsPath#prune retain the original path on success
Merge pull request #3641 from richdougherty/results-disk-cached

Make Cached work with DI and disk caches
Merge pull request #3666 from gmethvin/jspath-prune

The path returned by JsPath.prune should be the original path