Started work on fix-sampling branch
Removed redundant tests
Removed unused imports
Removed num_sites and num_sources from job_stats
Merge pull request #1464 from gem/fix-sampling

Removed redundant tests
Merge pull request #1465 from gem/remove-num_sites

Removed num_sites and num_sources from job_stats
Merged from master