Merge commit 'refs/top-bases/experimental/vim-plugins' into experimental/vim-plugins

* commit 'refs/top-bases/experimental/vim-plugins': (122 commits)
  Oxygen-gtk: upgrade to 1.3.4
  Added flatiron nodejs package + updated other nodejs packages
  apcupsd: use /run/nologin (instead of /etc/nologin) to prevent logins
  nvidia: also install useful nvidia-smi tool
  fix bug in perf-linux installation, oops
  haskell-yesod-bin: update to version 1.2.2
  haskell-yaml: update to version 0.8.4
  haskell-xml-types: update to version 0.3.4
  haskell-xml-conduit: update to version 1.1.0.5
  haskell-shakespeare-text: update to version 1.0.0.6
  haskell-shakespeare-js: update to version 1.1.4.1
  haskell-shakespeare-css: update to version 1.0.6.2
  haskell-contravariant: update to version 0.4.3
  haskell-conduit: update to version 1.0.7.3
  haskell-comonad-transformers: update to version 3.0.4
  haskell-classy-prelude: update to version 0.5.9
  haskell-attoparsec-conduit: update to version 1.0.1.2
  haskell-atomic-primops: update to version 0.4
  haskell-mode: upgrade to 13.07
  Add mi2ly MIDI to lilypond converter
  ...

Conflicts:
	pkgs/misc/vim-plugins/default.nix
Merge commit 'refs/top-bases/experimental/vim-plugins' into experimental/vim-plugins

* commit 'refs/top-bases/experimental/vim-plugins': (137 commits)
  wine: upgrade to 1.6 + latest gecko/mono extensions
  Fix unneeded inherit
  Adding x-cape keyboard mapping helper
  Adding Lush: Lisp Universal SHell
  Make the setup-hook work again now that nodejs modules reside in lib/node_modules
  Add fs-walk node package + updated other nodejs packages
  nixpkgs-lint: Add support for filtering by maintainer
  Bump disnix,disnixos and dysnomia to latest development versions
  python-packages.nix: unsubscribe myself from some Hydra mails
  nose: run tests as noted in https://code.google.com/p/python-nose/issues/detail?id=387#c4
  Limnoria: update to 2013-06-01
  limnoria: add git as dependency, otherwise build fails
  VM builds: Update debian Wheezy image to v7.1.
  thttpd: New package, version 2.25b.
  fillDiskWithDebs: Create fake start-stop-daemon.
  nose: remove failing test
  git: find global configs in /etc/ instead of /etc
  gmvault: use logbook 0.4.2
  don't wrap scripts in EGG-INFO/scripts since they are called from python
  distutils2: remove the package, nothing depends on it and it's obsolete
  ...
Merge remote-tracking branch 'refs/remotes/gh/experimental/vim-plugins' into HEAD

* refs/remotes/gh/experimental/vim-plugins:
  fix command-t
  update patch
  update YouCompleteMe
  adding YouCompleteMe
  new tg branch experimental/vim-plugins
Merge commit '0c3948803cb1a4092ecdd64c10190d7fdc7f0a66' into experimental/vim-plugins

* commit '0c3948803cb1a4092ecdd64c10190d7fdc7f0a66':
  fix command-t
Merge commit '4403312e6bd727a90d8a6eec6a6a6655f9dcc6d5' into experimental/vim-plugins

* commit '4403312e6bd727a90d8a6eec6a6a6655f9dcc6d5':
  Added forever-monitor nodejs package