Brought up to date with changes on cluster
Merge branch 'master' of https://github.com/GregOwen/tpcds_test