Added num_sites to calc.gmf
Removed the total_sites parameter from the SiteCollection.expand method
Fixed an expand test
Merge pull request #165 from gem/removing-ruptures-1

Simplified SiteCollection.expand
Merge remote-tracking branch 'upstream/master'