initial work for moving to a single chef server for each matrix build
moded to boolean switch for testing remote chef
fixed merge issues