Remove unncecessary generated helper specs
Fix model associations
Merge branch 'master' of github.com:moztemo/drinkstudio