Fix test dependency
Merge remote-tracking branch 'upstream/master'

Mike updated repo for better passing tests with randomizer thingie
Refactor data management out of the sinatra app