buildNodePackage: add shell hook for development
Adds merlin

Merlin is an editor-independant tool to ease the developpement of
programs in OCaml. It aims to provide features available in modern IDEs.

Homepage: http://the-lambda-church.github.io/merlin/
nixos/znc-service: don't use types.string (it's deprecated)

Apart from s/types.string/types.str/ (or types.lines where appropriate):

* port is changed from string to int.

* extraFlags is changed from types.string (with unfortunate merge
  semantics) into a list of strings. A list of strings merge better:
  one space is added between elements.
ncmpc: updated to version 0.23.
Merge remote-tracking branch 'upstream/master'
Add SpiderOak secure backup service.
added snes9x-gtk with pulseaudio support
Merge remote-tracking branch 'upstream/master'
made changes requested by pSub
gnuplot: version bump 4.6.3 -> 4.6.5
gnuplot: add optional Qt terminal
Add dwarf fortress 2014 (unstable) version
add ps to path for build
fix e18 cpufreq module: set setuid to freqset
added attrPath="qt53Full" and "attrPath="qt53"; qt-5.2 still default
Add dungeon crawl stone soup 0.14
vimpc: initial install script
Fix bloomfilter package on 32 bits

The git-annex derivation depends on bloomfilter and it's currently broken on
i686 because of this.  Upstream bloomfilter pull request already sent, this
is for the meantime.
elasticsearch: add support for plugins
Update Serf to 0.6.3