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
scummvm: version bump to 1.7
rust: Add hashes for i686-darwin
thunderbird-bin: Update to version 31.0.
Ansible: updated to 1.6.10
rust: Add an alternative package for the master tip

based off of pull request #3084
modprobe.nix: Use modern environment.etc syntax
Fixed download path
Merge pull request #3421 from blazbratanic/master

Fixed download path for eclipse swt package.
Merge pull request #3415 from bodil/master

thunderbird-bin: Update to version 31.0.
Merge pull request #3417 from madjar/master

Ansible: updated to 1.6.10
Merge pull request #3409 from FlashKorten/scummvm_1.7

scummvm: version bump to 1.7
rust: Refer to 0.11.nix directly in all-packages
rather than use default.nix indirection
Merge pull request #3395 from mixis/master

ATS2 version [0.0.7] --> [0.1.0]
rustc: rename rust to rustc, but keep rust attr name for backwards compat
Merge pull request #3412 from Ericson2314/rust-master

Add alternative rustc package for master tip
perl-packages: Add AnyEvent::I3, version 0.15.

This is needed in order to run the i3 test suite.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>