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/
ATS2 version [0.0.7] --> [0.1.0]
rust: Prepare for more versions part 1:
 - Factor out some things that REALLY shouldn't change between versions
rust: Prepare for more versions part 2:
 - Default is now an alias for 0.11
added cadaver: a command-line WebDAV client for Unix
scummvm: version bump to 1.7
rust: Add hashes for i686-darwin
gtkpod: bump to 2.1.4
added meta information
Agda needs an older version of haskell-equivalence
idris: 0.9.14 -> 0.9.14.1
thunderbird-bin: Update to version 31.0.
Updating octave to 3.8.1
Setting retroshare 0.6 as lowPrio, it's unstable.
Ansible: updated to 1.6.10
Revert "Remove obsolete jackaudio version 1."

This reverts commit bdb77826d98544ab37741f740dd3516023924b27.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
add uTox
Merge pull request #3413 from svenkeidel/gtkpod

version bump gtkpod from 1.0.0 to 2.1.4
tor: update from 0.2.4.22 to 0.2.4.23
cadaver: change to platform.unix and specify licence (gpl2)