Merge branch 'master' of github.com:JerrySievert/http-db
make expiration not rely on milliseconds