Uncommented lines in bin/rspec
Merge remote-tracking branch 'origin/master'