Added Phi intrinsics
Merge branch 'master' of github.com:cdiss/POP_REU_2014

Conflicts:
	testHarness.C