Fixed it
Merge branch 'master' of github.com:nacrooks/plocc

Conflicts:
	scripts/emulab/econfig.py