sync with develop

fix conflict detection in unit tests

{bio}[goolf/1.4.10] MACS 1.4.2-1 (REVIEW)

use FTPGNOME_SOURCE where applicable

Update texinfo-5.2-GCC-4.8.2.eb

{phys}[intel/2015a] FDS r18915 (REVIEW)

make texinfo a build dep in bc easyconfig

sync with develop, fix dep version conflicts in cairo easyconfig

{tools,vis}[intel/2015a] Ghostscript 9.16 + cairo 1.14.2 + GLib 2.44.1 (REVIEW)

add GMP as missing dep in Python 2.7.10 easyconfigs (required for pycrypto extension)

fix remarks

Add comment on mpi wrappers to impi

This reverts commit 973d4fec.

{bio}[goolf-1.7.20] Ghostscript 9.16 (REVIEW)

New version of MuTect to use Java 1.7.0_80

{tools}[intel/2015a] pycosat 0.6.0 + networkx 1.10 w/ Python 2.7.10

use GLib 2.44.1 (stable) rather than 2.45.x (development)

Merge branch 'Ghostscript-9.16-goolf-1.7.2' of github.com:npklein/easybuild-easyconfigs into Ghostscript-9.16-goolf-1.7.2

1856 java dep updates