Also resolve minor nitpicks -- *during* the merge commit.
Nixpkgs is a collection of packages for Nix package manager. Nixpkgs also includes NixOS linux distribution source code.
