Revert "Revert "collection = model""
Revert "Revert "collection = model""

This reverts commit cda7f1a5ff9b54c98e658981de34e75288dd61ec.

Acidburn0zzz/pump.io,e14n/pump.io,detrout/pump.io,grdryn/pump.io,stephensekula/pump.io,e14n/pump.io,pump-io/pump.io,landsurveyorsunited/pump.io,profOnno/pump.io,OpenSocial/pump.io,e14n/pump.io,gabrielsr/pump.io,grdryn/pump.io,pump-io/pump.io,OpenSocial/pump.io,pump-io/pump.io,detrout/pump.io,stephensekula/pump.io,strugee/pump.io,Acidburn0zzz/pump.io,gabrielsr/pump.io,strugee/pump.io,stephensekula/pump.io,landsurveyorsunited/pump.io,profOnno/pump.io