Conflicts:
	easybuild/build.py
	easybuild/easyblocks/b/binary.py
	easybuild/easyblocks/i/icc.py
	easybuild/easyblocks/i/ifort.py
	easybuild/easyblocks/i/imkl.py
	easybuild/easyblocks/n/netcdf.py
	easybuild/easyblocks/p/packedbinary.py
	easybuild/framework/application.py
	easybuild/tools/module_generator.py

Conflicts:
	easybuild/build.py
	easybuild/easyblocks/o/openfoam.py
	easybuild/easyblocks/p/pasha.py
	easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb
	easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb
	easybuild/framework/application.py
	easybuild/framework/easyconfig.py

cleanup in develop branch

added ecore clusterapps .eb file

Conflicts:
	easybuild/build.py

implement support for running EasyBuild without easyconfig file, and overriding easyconfig parameters on the command line

slightly increase wait time for asyncprocess.recv_some to 0.2s, because unit test was something failing because 0.1s was not long enough for an echo to always finish