First round of updates for the Project Nami HTTP object cache implementation.
Merge branch 'master' of http://github.com/ProjectNami/projectnami