Rebuilt Gemfile.lock file; Locked down rspec-rails to 2.14.2 since rspec 3.0.0 changes 'pending' meaning
Merge pull request #126 from jasnow/master

Locked down rspec-rails to 2.14.2 since rspec 3.0.0 changes 'pending' meaning then rebuilt Gemfile.lock file