1. Remove unused commented lines.
1. mpich2-devel is obsolete in 6.6 and is replaced by mpich-devel.
2. Remove unused commented lines.
Merge branch 'master' of https://github.com/pegasus-isi/pegasus