xscreensaver: update from 5.26 to 5.29
Added jmacro-*
polipo: update to 1.1.1
elasticsearch: update to 1.2.2
bgs: update from 0.5 to 0.6
nvidia-x11: Update to 340.24
Merge pull request #3244 from ehmry/xscreensaver

xscreensaver: update from 5.26 to 5.29
Merge pull request #3286 from wjlroe/elasticsearch-1.2.2

elasticsearch: update to 1.2.2
blender: Update to 2.71
fftw: Update to 3.3.4
blender: Fix jackaudio dependency
blender: Enable ocean modifier
blender: Don't use system openjpeg

It was ignored anyway (instead using the internal openjpeg copy).
Fix virtualbox image building with new nix
Add haskell-simple-conduit
blaze-from-html: add version 0.3.2.1
Update haskell-simple-conduit
Fix various Haskell packages for 7.8
haskell-git-annex: corrections for darwin
haskell-djinn: corrections for darwin