diff --git a/.gitignore b/.gitignore
index dc496fa..ad0785f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
 _site
 .jekyll-assets-cache
 _drafts
+*~
+*.swp
+*.swo
diff --git a/_config.yml b/_config.yml
index 84aff40..0655da2 100644
--- a/_config.yml
+++ b/_config.yml
@@ -72,4 +72,4 @@ assets:
   css_compressor: yui
 
 include: [".htaccess"]
-exclude: ["lib", "config.rb", "Capfile", "config", "log", "Rakefile", "Rakefile.rb", "tmp", "less", "*.sublime-project", "*.sublime-workspace", "test", "spec", "Gruntfile.js", "package.json", "node_modules", "Gemfile", "Gemfile.lock", "deploy"]
+exclude: ["lib", "config.rb", "Capfile", "config", "log", "Rakefile", "Rakefile.rb", "tmp", "less", "*.sublime-project", "*.sublime-workspace", "*~", "*.swp", "*.swo", "test", "spec", "Gruntfile.js", "package.json", "node_modules", "Gemfile", "Gemfile.lock", "deploy"]