Fix matching of wildcard path param with trailing /
Merge branch 'master' of github.com:walmartlabs/hapi
Merge pull request #496 from mikeal/cache2-pull

Distributable cache for files
Merge branch 'master' of github.com:walmartlabs/hapi
Revert "Merge pull request #474 from walmartlabs/develop"

This reverts commit 0c91ecadb0e8be1c1467ce59cb44dea706736d3c, reversing
changes made to 7e3a2a5fdf86b5883d26836cfc07d31e0c9dced5.
Undo mess
Merge pull request #518 from walmartlabs/master

Fixing master/develop mess