Upgrades: guard-rspec (3.1.0 ~> 4.2.7), rspec-rails (minor)
Merge remote-tracking branch 'upstream/master'