Upgraded rails to 3.2.14; new Gemfile.lock
Merge pull request #263 from jasnow/master

Upgraded rails to 3.2.14; new Gemfile.lock file