Improve Docker setup (PR #497)

.gitignore

@@ -1,25 +1,41 @@
-log/*.log
-tmp/**/*
-config/app_config.yml
-config/database.yml
-config/initializers/secret_token.rb
+.bundle
+.rake_tasks*
 db/*.sqlite3
-nbproject/
+log
+node_modules
+tmp
+public/assets
+public/system
+public/uploads
+vendor/bundle
+
+# no configuration
+config/*.yml
+!config/i18n-js.yml
 config/environments/development.rb
-*.swp
-*~
-public/**/*_cached.*
+
+# IDEs, Developer tools
 .idea
+.loadpath
+.project
+.sass-cache
+.rbenv-version
 .get-dump.yml
-.sass-cache/
+.bash_history
+.localeapp
+nbproject/
+.*.sw?
+*~
+
+coverage
+tags
 doc/app/
 doc/api/
 .yarddoc/
-# Deployment tools
-Capfile
-config/deploy.rb
-config/deploy/*
-.localeapp
-log/localeapp.yml
-.bundle
 rspec.failures
+
+# Capistrano etc.
+Capfile
+config/deploy
+config/deploy.rb
+Gemfile.capistrano*