make Metric#total optional
Merge branch 'master' into optional-total

Conflicts:
	spec/unit/email_helper_spec.rb
Merge pull request #57 from afeld/optional-total

make Metric#total optional