Merge pull request refinery#1423 from resolve/guardfile_reads_from_us…

…er_dot_rspec

Read from both the user's .rspec file and the one inside the directory.

Guardfile

@@ -21,7 +21,7 @@ guard 'spork', :wait => 60, :cucumber => false, :rspec_env => { 'RAILS_ENV' => '
 end
 
 guard 'rspec', :version => 2, :spec_paths => extensions.map{|e| "#{e}/spec"},
-  :cli => (File.read('.rspec').split("\n").join(' ') if File.exists?('.rspec')) do
+  :cli => (['~/.rspec', '.rspec'].map{|f| File.read(File.expand_path(f)).split("\n").join(' ') if File.exists?(File.expand_path(f))}.join(' ')) do
   extensions.each do |extension|
     watch(%r{^#{extension}/spec/.+_spec\.rb$})
     watch(%r{^#{extension}/app/(.+)\.rb$})                           { |m| "#{extension}/spec/#{m[1]}_spec.rb" }