vim: supporting multiple sources:
- vim-nox: client-server implementation without X
- latest:  latest mercurial sources (still very stable)
- default: latest release

vim-plugins: Introduce an area to put vim plugins which are worth adding to nix
because they need more effort than just "unpacking". Document that
linux-3.9: upgrade to 3.9.5
add hsshellscript
firefox: enable the (enabled by default) elf hack

It's supposed to speed things up but had some troubles in the past
that seem to have been fixed
haskell-accelerate: update to version 0.13.0.4
haskell-contravariant: update to version 0.4.1
haskell-entropy: update to version 0.2.2.1
haskell-ghc-vis: update to version 0.7.1
nijs: Bumped to 0.0.6
Merge branch 'master' of github.com:NixOS/nixpkgs
bind: avoid build impurity by explicitly enabling/disabling features

The BIND configure script finds extra dependencies in /usr/include and /usr/lib,
and activates additional features if it does. This may cause the build to fail
on systems that cannot use a chroot environment. Actively disabling those
additional features prevents this issue from occurring.
nijs: Bump to 0.0.7
Update nodePackages

Signed-off-by: Shea Levy <shea@shealevy.com>
Plone: fix for 4.1
plone: 4.1 should use python 2.6
pythonPackages.lxml: added 2.3 version
Ruby 1.9 parallel build sometimes fails due to races.
perlPackages.AlgorithmMerge: new expression
perlPackages.CacheMemcached: new expression
perlPackages.StringEscape: new package