Merge pull request #280 from jasnow/master

Upgraded Rails to 3.2.15; Rebuilt Gemfile.lock file
Gem updates
Gem updates
Gem updates
Don't allow nil collaborators to be returned
Gem updates
Gem updates