Merge branch 'develop' into ghc
Fix dependency on zlib
Merge branch 'ghc' of github.com:itkovian/easybuild-easyconfigs into ghc

Conflicts:
	easybuild/easyconfigs/g/GHC/GHC-7.4.2-goalf-1.1.0-no-OFED.eb