diff --git a/.dockerignore b/.dockerignore
index 9414382..7afd8d4 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +1,18 @@
+# Compiled python code
+**/__pycache__/
+**/*.py[cod]
+
+# Vagrant
+.vagrant/
+
+# Visual Studio Code
+.vscode/
+
+# macOS
+**/.DS_Store
+**/.AppleDouble
+**/.LSOverride
+**/._*
+
+# Other
 Dockerfile
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..10fbcc3
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,29 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+
+[{*.sh,Vagrantfile}]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
+[*.py]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+indent_style = space
+trim_trailing_whitespace = false
+
+[*.rst]
+indent_style = space
+trim_trailing_whitespace = true
+
+[*.{yaml,yml}]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
diff --git a/.gitignore b/.gitignore
index ee70e67..9f3c73b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,15 @@
+# Backup files
+*~
+*.bak
+*.orig
+*.rej
+
 # Python
 build
 dist
 Mini_NDN.egg-info
-*.pyc
+__pycache__/
+*.py[cod]
 
 # Docs
 docs/html
@@ -10,9 +17,17 @@
 docs/_build
 
 # Misc
-.DS_Store
-dl
+dl/
 *.apconf
 
 # Vagrant
-.vagrant
+.vagrant/
+
+# Visual Studio Code
+.vscode/
+
+# macOS
+.DS_Store
+.AppleDouble
+.LSOverride
+._*