export icc as default MPI compiler when building papi in papi test
Merge branch 'master' of github.com:rdewaele/adhd
static patch and MPI compilation patch conflict resolved

Conflicts:
	papi-test/Makefile