multitouch: Invert left-right scrolling when invertScroll is enabled
D'oh
Global replace /var/run/current-system -> /run/current-system
Global replace /var/run/booted-system -> /run/booted-system
Global replace /var/run/opengl-driver -> /run/opengl-driver
modules/security/pam.nix: add xscreensaver to the list of services
crashdump: it required some kernel options for the nmi_watchdog to work.

Now it says at boot, for every core:
NMI watchdog: enabled, takes one hw-pmu counter.
Don't create /var/log/upstart/<jobname> unless necessary
adding option to create /etc/passwd
allow out-of-tree nixos modules

The environment variable "NIXOS_EXTRA_MODULES" is now checked to
contain a path to a file similar to modules/module-list.nix.

This gives the ability to include nixos modules that are not in the
nixos source tree.

This can be useful for modules that are still experimental, or which
aren't useful for other nixos users. Of course, this was already
possible to do this using a forked nixos tree, but with this
functionality, you can just rely on the nixos channel, easing things a
lot.
Revert "allow out-of-tree nixos modules"

This reverts commit b609ff4fcf48b2124d94bf1052c303a36c8cabf1.

It turns out this can just be done using "require".
fix init-script-builder
Mount securityfs needed for AppArmor and some TPM drivers.
Should be harmless.
AppArmor: packaged
Merge commit 'refs/top-bases/experimental/minimal-install-archive' into experimental/minimal-install-archive

* commit 'refs/top-bases/experimental/minimal-install-archive':
  AppArmor: packaged
  Mount securityfs needed for AppArmor and some TPM drivers. Should be harmless.
  Revert "allow out-of-tree nixos modules"
  allow out-of-tree nixos modules
  Don't create /var/log/upstart/<jobname> unless necessary
  crashdump: it required some kernel options for the nmi_watchdog to work.
  modules/security/pam.nix: add xscreensaver to the list of services
  Global replace /var/run/opengl-driver -> /run/opengl-driver
  Global replace /var/run/booted-system -> /run/booted-system
  Global replace /var/run/current-system -> /run/current-system
  D'oh
  multitouch: Invert left-right scrolling when invertScroll is enabled
Merge branch 'experimental/minimal-install-archive' into refs/top-bases/experimental/marc

* experimental/minimal-install-archive:
  AppArmor: packaged
  Mount securityfs needed for AppArmor and some TPM drivers. Should be harmless.
  Revert "allow out-of-tree nixos modules"
  allow out-of-tree nixos modules
  adding option to create /etc/passwd
  Don't create /var/log/upstart/<jobname> unless necessary
  crashdump: it required some kernel options for the nmi_watchdog to work.
  modules/security/pam.nix: add xscreensaver to the list of services
  Global replace /var/run/opengl-driver -> /run/opengl-driver
  Global replace /var/run/booted-system -> /run/booted-system
  Global replace /var/run/current-system -> /run/current-system
  D'oh
  multitouch: Invert left-right scrolling when invertScroll is enabled

Conflicts:
	modules/programs/bash/profile.sh
Merge commit 'refs/top-bases/experimental/multi-shell-support' into experimental/multi-shell-support

* commit 'refs/top-bases/experimental/multi-shell-support':
  AppArmor: packaged
  Mount securityfs needed for AppArmor and some TPM drivers. Should be harmless.
  Revert "allow out-of-tree nixos modules"
  allow out-of-tree nixos modules
  Don't create /var/log/upstart/<jobname> unless necessary
  crashdump: it required some kernel options for the nmi_watchdog to work.
  modules/security/pam.nix: add xscreensaver to the list of services
  Global replace /var/run/opengl-driver -> /run/opengl-driver
  Global replace /var/run/booted-system -> /run/booted-system
  Global replace /var/run/current-system -> /run/current-system
  D'oh
  multitouch: Invert left-right scrolling when invertScroll is enabled

Conflicts:
	modules/programs/bash/profile.sh
Merge branch 'experimental/multi-shell-support' into refs/top-bases/experimental/marc

* experimental/multi-shell-support:
Merge commit 'refs/top-bases/experimental/php' into experimental/php

* commit 'refs/top-bases/experimental/php':
  AppArmor: packaged
  Mount securityfs needed for AppArmor and some TPM drivers. Should be harmless.
  Revert "allow out-of-tree nixos modules"
  allow out-of-tree nixos modules
  Don't create /var/log/upstart/<jobname> unless necessary
  crashdump: it required some kernel options for the nmi_watchdog to work.
  modules/security/pam.nix: add xscreensaver to the list of services
  Global replace /var/run/opengl-driver -> /run/opengl-driver
  Global replace /var/run/booted-system -> /run/booted-system
  Global replace /var/run/current-system -> /run/current-system
  D'oh
  multitouch: Invert left-right scrolling when invertScroll is enabled
Merge commit 'refs/top-bases/experimental/postfix' into experimental/postfix

* commit 'refs/top-bases/experimental/postfix':
  AppArmor: packaged
  Mount securityfs needed for AppArmor and some TPM drivers. Should be harmless.
  Revert "allow out-of-tree nixos modules"
  allow out-of-tree nixos modules
  Don't create /var/log/upstart/<jobname> unless necessary
  crashdump: it required some kernel options for the nmi_watchdog to work.
  modules/security/pam.nix: add xscreensaver to the list of services
  Global replace /var/run/opengl-driver -> /run/opengl-driver
  Global replace /var/run/booted-system -> /run/booted-system
  Global replace /var/run/current-system -> /run/current-system
  D'oh
  multitouch: Invert left-right scrolling when invertScroll is enabled