Merge remote-tracking branch 'upstream/horrifically-broken-dont-touch' into scheduling_models
Also made many changes to seeds.rb
unbroken populated db