Only include current certificates in status count
Clean up some scopes that appeared to be named incorrectly

The expired(surveys) scope was selecting only certificates without an expiry date. It was only being used by set_expired(surveys) though so I renamed and refactored that to use a subquery instead of a select and in condition.
Merge pull request #950 from theodi/feature-more-accurate-certificate-stat

Only count current certificates