Separate and articulate scoring rules; fixes #23

"fourth-year" and "post-senior" don't follow from each other.