Merge branch 'master' into staging

Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
ess: bump version to 14.09
Merge pull request #4895 from joachifm/ess-14_09

ess: bump version to 14.09
pycdio: fix build
klavaro: update from 2.00 to 3.01
FileZilla: update from 3.8.1 to 3.9.0.6
emacs-ess: update checksum of the tarball
update-users-groups.pl: Use UTF-8 instead of latin1.

Perl seems to write the file in latin1 independent of the actual input
encoding.  This can corrupt the "description" field of /etc/passwd.  By
setting "binmode" to ":utf8" Perl can be forced to write UTF-8.  Ideally
the program would simply read/write the fields by value without any
changes in encoding.  However, assuming/enforcing UTF-8 is a lot better
than using an obsolete coding like latin1.
Merge pull request #4891 from pSub/prefer-xresources

Try to load Xresources, if that fails fall back to Xdefaults. Closes #4670
Merge pull request #4859 from abbradar/git-daemon

nixos/git-daemon: fix a bug and add 'user' and 'group' options
experimental/vim-vam-pathogen-vimrc-support

This patch implements derving a .vimrc from vim-plugins.nix loading those
plugins by either Pathogen or VAM (VAM seems to be slightly faster and is much
more powerful).

Example:

  environment.systemPackages = [
   # default plain vim
   vim_configurable

   # vim which get's called vim-with-addon-nix
   (vim_configurable.customize {
      name = "vim-with-addon-nix";
     vimrcConfig.vam.pluginDictionaries = [{name = "vim-addon-nix"; }];
   })
  ];

This way you can provide an "enhanced Vim" and a standard Vim.

Details about what this commit changes:
1) provide a new toplevel name vimrc which
  * provides a way to build up a .vimrc using either pathogen or VAM (knowing about plugin dependencies by name)
  * can enhance vim to support. vim.customize { name = "name-user"; vam.pluginDictionaries and/or pathogen.pluginNames = .. }
  * introduce rtp names for each vim plugin pointing to the runtimepath path
  * suggest naming to be the same as vim-pi so that VAM's dependencies work
  * derive some packages as example from vim-pi using VAM's new autoload/nix.vim
    supporting simple dependencies
  * test case for vim-addon-nix for VAM/pathogen

2) enhance vim_configurable to support .customize

3) update many plugins by using VAM's implementation not rewriting those which
  * vim-pi doesn't know about the git source yet (TODO: make vim-pi be aware of
    those)
  * have special build code

This commit partially conflicts with commits done by Bjørn Forsman starting by
37f961628b, eg the one using lower case attr and pkg names, because they don't
match vim-pi (eg YouCompleteMe). Rather than resolving the conflict this just
adds aliases so that both names can be used
Merge pull request #4823 from abbradar/synaptics-fix

synaptics: fix tapButtons setting
nixos-rebuild: reload dbus before starting other units. Closes #4546
Merge pull request #4822 from abbradar/crawl

crawl: fix, update, add console version
tomcat-connectors: 1.2.32 -> 1.2.40
rubber: Disable etex detection.

If etex detection is running it forces LaTeX files using etex package to
be compiled with elatex which is no longer part of current TexLive,
efectivelly making it impossible to simply compile them without hacking
through rubber's commandline option.
I took this fix from fedora .spec for rubber.
Merge pull request #4834 from offlinehacker/pkgs/flannel/add

Add flannel, etcd backed network fabric for containers
remove unused pythonLinkmeWrapper
Adding Fish-Fillets-NG game
fix sha for a slim's theme