--- a/Commands/Debug Experiment RSpec.tmCommand	
+++ b/Commands/Debug Experiment RSpec.tmCommand	
@@ -6,7 +6,7 @@
 	<string>nop</string>
 	<key>command</key>
 	<string>#!/usr/bin/env ruby
-require "#{ENV['TM_BUNDLE_SUPPORT']}/lib/spec_debugger"
+require "#{ENV['TM_BUNDLE_SUPPORT']}/lib/rdebug_helpers.rb"
 
 debug_rspec(:file)</string>
 	<key>fallbackInput</key>

--- a/Commands/RSpec - run and breakpoint at current line (current examples).tmCommand	
+++ b/Commands/RSpec - run and breakpoint at current line (current examples).tmCommand	
@@ -6,7 +6,7 @@
 	<string>nop</string>
 	<key>command</key>
 	<string>#!/usr/bin/env ruby
-require "#{ENV['TM_BUNDLE_SUPPORT']}/lib/spec_debugger"
+require "#{ENV['TM_BUNDLE_SUPPORT']}/lib/rdebug_helpers.rb"
 
 debug_rspec(:focussed)</string>
 	<key>fallbackInput</key>

--- a/Commands/Run server in debug mode.tmCommand	
+++ b/Commands/Run server in debug mode.tmCommand	
@@ -21,9 +21,10 @@ else
   init_debug_run_file("load '#{merb_path}'")
 end
 
+launch_dbg_controller(0.25)
 launch_dbg_instance
 
-launch_dbg_controller(0.25)
+
 </string>
 	<key>input</key>
 	<string>selection</string>

--- a/Support/lib/rdebug_helpers.rb
+++ b/Support/lib/rdebug_helpers.rb
@@ -22,7 +22,7 @@ while Debugger.handler.interface.nil?; sleep 0.10; end
   end
 end
 
-def launch_dbg_controller(seconds_to_wait)    
+def launch_dbg_controller(seconds_to_wait = 0.01)    
   Thread.new { 
     sleep seconds_to_wait;
 
@@ -33,6 +33,14 @@ def launch_dbg_controller(seconds_to_wait)
   }
 end
 
+def launch_dbg_instance
+  term = Appscript::app("Terminal")
+  term.activate
+  term.do_script "cd #{ENV['TM_PROJECT_DIRECTORY'].to_s.inspect} && rdebug -s #{RUN_FILE}; exit"
+
+  sleep 0.25
+end
+
 def debug_rspec(focussed_or_file = :file)
   raise "Invalid argument" unless %w[focussed file].include?(focussed_or_file.to_s)
   
@@ -50,7 +58,6 @@ EOF
   load 'rdebug'
 end
 
-
 def cleanup_dbg
   FileUtils.rm_f(RUN_FILE)
 end
\ No newline at end of file

--- a/Support/lib/spec_debugger.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# TextMate helpers
-# Adapted from rspec-bundle (multiple contributors, see http://rspec.info/community/)
-# 
-# Ruby-debug support added by Tim Harper with Lead Media Partners.
-# http://code.google.com/p/productivity-bundle/
-
-require 'rubygems'
-gem 'ruby-debug'