pythonPackages.django: update 1.4, 1.5, 1.6 due to security fixes
pythonPackages: fix webtest
pythonPackages.psycopg2: 2.5.2 -> 2.5.3
zope.testing: 4.1.2 -> 4.1.3 (also, fix pypy build)
Add NixOS module for Riemann monitoring server.
Add NixOS module for the Riemann dashboard server
xorg: add xf86-video-qxl
PIL: use python executable names
pypyPackages.pycrypto: make it work
fix eval
haskell-poppler: update to 0.13

Fixed by upstream.
Merge pull request #3739 from Fuuzetsu/poppler

haskell-poppler: update to 0.13
Update cabal-lenses to v3.1, no longer needs to be jailbroken
Fix Julia 0.3.0 build (for most purposes). Not making default yet because it is unclear if I missed something important. Failed to make it use external openblas and lapack correctly…
Merge pull request #3740 from MP2E/cabal_lenses

Update cabal-lenses to v3.1, no longer needs to be jailbroken
Merge remote-tracking branch 'origin/master' into zookeeper

Conflicts:
	nixos/modules/misc/ids.nix