/log/*.log
/tmp
-config/.secret_token
+/config/.secret_token
+/config/initializers/secret_token.rb
/public/assets
/config/environments/development.rb
+/config/environments/test.rb
+/config/environments/production.rb
+/config/application.yml
+/config/piwik.yml
+
+# editor backup files
*~
+
+# Capistrano files are coming from another repo
+/Capfile*
+/config/deploy*
+
+# Themes are coming from another repo
+/themes/*