model associations are all fixed
Merge branch 'master' of https://github.com/lunchpad/lunchpad.us into upstream_merge
merging conflicts
Merge pull request #22 from nickpassarella/master

Model associations are fixed and working for current models