fix rake task markus:reset
Merge pull request #1466 from oneohtrix/master

fix rake task markus:reset
fix failing submission tests
Merge pull request #1470 from oneohtrix/master

fix failing submission tests