bugfix for new headnodes not including themselves
Merge pull request #146 from pchandra/headcount

Fix for new headnodes not including themselves
Abstract out some mirror settings to permit overrides in env.