diff --git a/.gitignore b/.gitignore
index 708770e1..522bc7c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,15 +12,12 @@ db/data.yml
 db/schema.rb
 log
 nbproject
-public/javascripts/cache
-public/stylesheets/cache
 tmp
 vendor/plugins/query_trace/
 rerun.txt
-public/javascripts/jquery-cached.js
-public/javascripts/tracks-cached.js
-public/stylesheets/tracks-cached.css
 .idea
 .rvmrc
 .yardoc
 tags
+/.bundle/
+/public/assets/
diff --git a/.gitignore.rails2 b/.gitignore.rails2
deleted file mode 100644
index 8e2cc0f5..00000000
--- a/.gitignore.rails2
+++ /dev/null
@@ -1,25 +0,0 @@
-*~
-*.tmproj
-.dotest
-/.emacs-project
-/.redcar
-config/database.yml
-config/site.yml
-config/deploy.rb
-db/*.sqlite3
-db/data.yml
-db/schema.rb
-log
-nbproject
-public/javascripts/cache
-public/stylesheets/cache
-tmp
-vendor/plugins/query_trace/
-rerun.txt
-public/javascripts/jquery-cached.js
-public/javascripts/tracks-cached.js
-public/stylesheets/tracks-cached.css
-.idea
-.rvmrc
-.yardoc
-tags
diff --git a/log.tmpl/apache.log b/log.tmpl/apache.log
deleted file mode 100755
index e69de29b..00000000
diff --git a/log.tmpl/development.log b/log.tmpl/development.log
deleted file mode 100755
index e69de29b..00000000
diff --git a/log.tmpl/production.log b/log.tmpl/production.log
deleted file mode 100755
index e69de29b..00000000
diff --git a/log.tmpl/test.log b/log.tmpl/test.log
deleted file mode 100755
index e69de29b..00000000