Merge Sprint2Scoring with Mike's branch manually.  Git is a headache.