Try to control growth of duplicate grader sets
Fix unicode rubric problems.
Merge remote-tracking branch 'origin/master' into fix/vik/bad-duplication

Conflicts:
	controller/models.py
Fix loop logic
Merge pull request #135 from edx/fix/vik/bad-duplication

Try to control growth of duplicate grader sets