Consolidate models into one file so they're loaded in order
Fix the edge gemspec