Add commented-out code for debugging specs that are otherwise thwarted by poltergeist's timeout
Fix migration - dependency on modified model relations
Fix broken specs