sudo: allow adding extra configuration options to the bottom of sudoers
add qemu-2.1

Conflicts:
	pkgs/top-level/all-packages.nix
spice: 0.12.4 -> 0.12.5
spice-protocol: 0.12.6 -> 0.12.7