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

undo copyright change to facilitate merge

add os.putenv and os.environ check in prep_for_release

Support for building/installing Pasha

Conflicts:
	easybuild/easyblocks/t/tbb.py
	easybuild/tools/toolkit.py

rename Pasha easyconfig dir, added patch file required for ictce, add easyconfig for goalf (refs #1127)

Conflicts:
	easybuild/build.py

rename Pasha easyconfig dir, added patch file required for ictce, add easyconfig for goalf (refs #1127)