fix python module builder
nxml-mode: remove from release as well
applications/networking/instant-messengers/mcabber:
  Updated to 0.10.1.
sane-backends: update snapshot to version: 1.0.22.git20121123
gocr: update to version 0.49
gocr: fix path to 'wish' in gocr.tcl
xsane: build with snapshot version of the sane backends

The last release of that code is ancient. Not sure what these SANE guys
are doing. Anyway, the current Git snapshot works just fine for me.
all-packages.nix: strip trailing whitespace
offlineDistutils in PYTHONPATH in configurePhase instead of builder.sh

Conflicts:
	pkgs/development/python-modules/generic/default.nix
Merge branch 'channel-nixos' into python-merge
Merge branch 'py/offline-distutils' into python-merge

Conflicts:
	pkgs/development/python-modules/generic/builder.sh
	pkgs/development/python-modules/generic/default.nix
fix mercurial -extra PYTHONPATH +setuptools

- PYTHONPATH is already set correctly
- setuptools is needed to see docutils
Add despotify
zathura: Update to 0.2.1 (also update plugins to latest)
notmuch: sha256 was wrong
pythonPackages.flake8: Update to 1.6.2
boost: wrong unpacking command
pythonPackages.turses: update to 0.2.9
Allow to skip more options to update-walker in simple cases. Now just an URL can work if everything is set up in default way
Update Compiz