Fixed broken merge in ProblemGrader and also removed tracking of development.yml from git.
Merge pull request #270 from goehle/fixingmerges

Cleaning up merge of 2.8 into develop