Ignore extra files

.gitignore

@@ -1,4 +1,36 @@
+# Bundler/Rubygems
+*.gem
+.bundle
+pkg/*
+tags
+test/tmp/
+bin/
+
+# Vagrant stuff
+acceptance_config.yml
+boxes/*
+/Vagrantfile
+/.vagrant
+
+# IDE junk
+.idea/*
+*.iml
+
+# Ruby Managers
+.rbenv
+.ruby-gemset
+.ruby-version
+.rvmrc
+
+# Temp files
 *~
+*.swp
+,*
+*.bak
+
+# OS-specific
+.DS_Store
+
 coverage
 __sandbox
 
@@ -13,10 +45,7 @@ cruisecontrol.iws
 *.ipr
 *.iml
 .tmtags
-.DS_Store
 tmtags
-.bundle
-bin/
 dist/
 vendor/plugins/rails_upgrade
 vendor/ruby/
@@ -26,14 +55,6 @@ vendor/cache
 server_jar/target/
 
 config/ccrb.properties
-pkg
 reports
 config/thin.yml
 
-.ruby-version
-.rbenv-version
-.rvmrc
-
-*.swp
-,*
-*.bak