Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
haskell-stm-containers: add package version 0.1.2 and its dependencies
xscreensaver: update from 5.26 to 5.29
Bump Logstash to 1.4.2
gbdfed: add package 1.6
Added Rest For Haskell and dependencies (rest-core, rest-types, rest-snap etc...)
Install all dirs for logstash

Also only patch shebangs in bin/ directory
Merge branch 'master' of github.com:aycanirican/nixpkgs
Added more rest packages.
vagrant: upgrade to 1.6.3
Added jmacro-*
polipo: update to 1.1.1
elasticsearch: update to 1.2.2
Package for Open Sans fonts.
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