Conflicts:
	easybuild/easyblocks/o/openfoam.py

Conflicts:
	easybuild/easyblocks/c/cp2k.py
	easybuild/easyblocks/i/itac.py
	easybuild/easyblocks/l/libsmm.py
	easybuild/easyblocks/t/tarball.py

OpenFOAM bug fixes and enhancements

proper fix for distribute issue with python

add module name for distribute

fix gpl headers

Conflicts:
	easybuild/scripts/prep_for_release.py

Conflicts:

	easybuild/scripts/prep_for_release.py

Conflicts:
	easybuild/build.py
	easybuild/easyblocks/b/binary.py
	easybuild/easyblocks/c/cp2k.py
	easybuild/easyblocks/i/imkl.py
	easybuild/easyblocks/i/intelbase.py
	easybuild/easyblocks/l/libsmm.py
	easybuild/easyblocks/m/mvapich2.py
	easybuild/easyblocks/n/ncl.py
	easybuild/easyblocks/n/netcdf.py
	easybuild/easyblocks/n/netcdf_fortran.py
	easybuild/easyblocks/p/python.py
	easybuild/easyblocks/w/wps.py
	easybuild/easyblocks/w/wrf.py
	easybuild/tools/asyncprocess.py
	easybuild/tools/module_generator.py

cherry-picked some commits from develop to enable a clean merge

undo copyright change to facilitate merge

Conflicts:

	easybuild/scripts/prep_for_release.py