renamed matches.h and matches.cpp to
matches2.h and matches2.cpp to avoid potential
confusion with Matches.h and Matches.cpp files.
use a better version of hosts.conf where we
specify the working directory for each host
entry. then we can use the exact same hosts.conf
file for each gb instance rather than having to
change the single "working-dir:" directive for
each instance, in the case where the each have
a different working directory.
Merge branch 'master' into diffbot

Conflicts:
	Make.depend