Refactor how goals work some
code review feedback
Merge pull request #789 from code-dot-org/studioGoals

Refactor how goals work some