Some cleanup around the guard config

Conflicts:
	Gemfile

Author: oreoshake

Gemfile

@@ -6,9 +6,8 @@ group :test do
   gem 'rails', '3.2.12'
   gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
   gem 'jdbc-sqlite3', :platform => :jruby
-  gem 'rspec-rails'
-  gem 'rspec'
-  gem 'guard-rspec', :platform => :ruby_19
+  gem 'rspec-rails', '>= 3.1'
+  gem 'rspec', '>= 3.1'
   gem 'growl'
   gem 'rb-fsevent'
   gem 'debugger', :platform => :ruby_19