(cleanup) Merge lockfile branch into master

`optional_namespace` branch was forked from `lockfile`, so resolving #26 merged it into `lockfile`, not `master`

please merge `lockfile` into `master`