Upgraded Rails to 3.2.15; Rebuilt Gemfile.lock file
Merge pull request #280 from jasnow/master

Upgraded Rails to 3.2.15; Rebuilt Gemfile.lock file