Partial attempt at upgrading to guard 2.2.2 and guard-rspec 4.0.3