make it nicer to work with and run

bin/attentive

@@ -1,11 +1,9 @@
 #!/usr/bin/env ruby
 
+if !ENV['BUNDLE_GEMFILE'] && File.file?('Gemfile')
   require 'rubygems'
-require 'bundler'
+  require 'bundler/setup'
 
-begin
-  Bundler.setup(:default)
-rescue Bundler::GemfileNotFound
   $: << File.expand_path('../../lib', __FILE__)
 end
 

lib/attentive/server.rb

@@ -41,7 +41,10 @@ module Attentive
       Pygments.highlight("attentive")
 
       Rack::Handler.default.run(Attentive::Server, :Port => options[:port]) do |server|
-        trap(:INT) { server.shutdown }
+        trap(:INT) do
+          server.shutdown if server.respond_to?(:server)
+          server.stop if server.respond_to?(:stop)
+        end
       end
     end