Merge branch 'develop' into 23_PEP0008fix

Conflicts:
	easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-goalf-1.1.0-no-OFED.eb
	easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-ictce-4.0.6.eb
	easybuild/easyconfigs/h/HDF5/HDF5-1.8.7-goalf-1.1.0-no-OFED-parallel.eb
	easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-goalf-1.1.0-no-OFED.eb
	easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-4.0.6-parallel.eb
	easybuild/easyconfigs/m/MrBayes/MrBayes-3.2.0-goalf-1.1.0-no-OFED.eb
	easybuild/easyconfigs/m/MrBayes/MrBayes-3.2.0-ictce-4.0.6.eb