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
Add to the SiteCollection an array of site ids
Changed ground_motion_fields to expand the result only if a non-trivial filter is passed
Merge pull request #166 from gem/add-site-ids

Add to the SiteCollection an array of site ids
Merge branch 'master' into gmf-no-expand
Updated a docstring
Toro et. al. 1997 GMPE as needed for the 2008 NSHMP-US model
Frankel et al. 1996 GMPE
Campbell 2003 GMPE for 2008 US hazard model
changed class name from FrankelEtAl1996NSHMP to FrankelEtAl1996NSHMP2008
removed unneeded import
changed class name from ToroEtAl1997NSHMP to ToroEtAl1997NSHMP2008
Merge pull request #171 from monellid/Campbell2003NSHMP

Campbell 2003 GMPE for 2008 US hazard model
Merge pull request #169 from monellid/toro1997_nshmp

Toro et. al. 1997 GMPE as needed for the 2008 NSHMP-US model
set rupture and distance context params in test without calling setattr
Merge pull request #170 from monellid/FrankelEtAl1996

Frankel et al. 1996 GMPE
AB2006 - 140 bar