Cleaned up some code
Merge pull request #526 from goehle/2.10-bugfixes

2.10 bugfixes
Merge branch 'release/2.10' of https://github.com/openwebwork/webwork2 into develop
Merge branch 'develop' of https://github.com/openwebwork/webwork2 into jitar2