diff --git a/.gitignore b/.gitignore
index 186d8db36b..7e8ef2a7ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,13 @@
+*.gem
+*.log
 .DS_Store
 .bundle
 .rspec
 db/*.sqlite3
 db/*.sqlite3-journal
 log/*.log
-tmp/**/*
-webrat.log
 pkg/*
 spec/dummy/db/*.sqlite3
 spec/dummy/db/*.sqlite3-journal
 spec/dummy/log/*.log
+tmp/**/*
diff --git a/Gemfile b/Gemfile
index 039da0cd95..dd71eded32 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,16 @@
 source 'http://rubygems.org'
 
 gem 'rails', '3.0.0'
-gem 'devise'
 gem 'builder'
-group :test, :development do
-  gem 'sqlite3-ruby', :require => 'sqlite3'
-  gem 'jeweler'
+gem 'devise'
+
+# Bundle gems for the local environment. Make sure to
+# put test-only gems in this group so their generators
+# and rake tasks are available in development mode:
+group :development, :test do
   gem 'dummy_data'
+  gem 'jeweler'
   gem "rspec-rails", ">= 2.0.0.beta.20"
+  gem 'sqlite3-ruby', :require => 'sqlite3'
   gem "webrat", :git => "git://github.com/kalv/webrat.git"
 end