Updated gitignore

Conflicts:

	.gitignore

.gitignore

@@ -18,9 +18,11 @@ test/fixtures/stylesheets/*/sass/.sass-cache
 pkg/*
 compass-*.gem
 coverage*
+bin/*
 docs
 doc-src/tmp
 doc-src/.bundle
 .bundle
 attic
+.rvmrc
 devbin

bin/compass

@@ -1,26 +1,16 @@
 #!/usr/bin/env ruby
-# The compass command line utility
+#
+# This file was generated by Bundler.
+#
+# The application 'compass' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
 
-# This allows compass to run easily from a git checkout without install.
+require 'pathname'
-def fallback_load_path(path)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  retried = false
+  Pathname.new(__FILE__).realpath)
-  begin
-    yield
-  rescue LoadError
-    unless retried
-      $: << path
-      retried = true
-      retry
-    end
-    raise
-  end
-end
 
-fallback_load_path(File.join(File.dirname(__FILE__), '..', 'lib')) do
+require 'rubygems'
-  require 'compass'
+require 'bundler/setup'
-  require 'compass/exec'
-end
 
-
+load Gem.bin_path('compass', 'compass')
-command_line_class = Compass::Exec::Helpers.select_appropriate_command_line_ui(ARGV)
-exit command_line_class.new(ARGV).run!