eratta bump
Eratta bump, removed the active record hack as associations aren't needed anymore (broke tests too), working on ironing out scoping