epiphany 3.12: fix wrapping binaries
evolution 3.12: fix wrapping binaries
ansible: conventions, fix module execution
typescript: add package. Closes #2712

Typed superset of JavaScript that compiles to plain JavaScript.

http://www.typescriptlang.org/
nixos-install: Fix running it after again the activation script
mkpasswd: Add to channel
Don't create /media

It's obsolete - udisks2 uses /run/media/<username>.
test-driver: Set context to include machines created by createMachine
NixOS ISO: Don't use a unionfs for /

We don't need a unionfs on /, we only need a tmpfs.
Don't kill unionfs-fuse during shutdown

Killing the daemon backing /nix/store prevents a clean shutdown.  See
http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/
Installer test: Get rid of a warning
Enable the xf86-video-modesetting driver
Installer test: Don't wait for dhcpcd if we don't have a network
Revert "typescript: add package. Closes #2712"

This reverts commit 93a7cf74b938598447343c49d80392c2ca607cba.
haskell-vector: update to version 0.10.9.2
haskell-binary: update to version 0.7.2.1
haskell-amqp: re-generate with cabal2nix
xmobar: re-generate with cabal2nix
vlock: add meta and take maintainership
Add option ec2.hvm, to set some boot configuration specific for EC2 HVM instances.

(cherry picked from commit 35c76d917307b7ac405486855cfe63021810dba5)

Conflicts:
	nixos/modules/virtualisation/amazon-image.nix