diff --git a/.gitignore b/.gitignore
index efbcad5a..df9358d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.lock
 sync
 tmp/*
+devbin
 examples/*/stylesheets/*
 examples/*/*.html
 examples/*/*/*.html
diff --git a/Rakefile b/Rakefile
index e67e036f..1ac7e194 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,6 @@
 require 'rubygems'
-require 'rake'
-$:.unshift File.join(File.dirname(__FILE__), 'lib')
+require 'bundler'
+Bundler.setup
 require 'compass'
 
 # ----- Default: Testing ------
@@ -10,7 +10,7 @@ task :default => :run_tests
 require 'rake/testtask'
 require 'fileutils'
 
-Rake::TestTask.new :run_tests do |t|
+Rake::TestTask.new :test do |t|
   t.libs << 'lib'
   t.libs << 'test'
   test_files = FileList['test/**/*_test.rb']