diff --git a/.gitignore b/.gitignore
index 875db1dd6b..7db36f6604 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 build
 *.py[co]
 pkg/arch/*.tar.xz
+*.swp
+doc/_build
 
 # virtualenv
 # - ignores directories of a virtualenv when you create it right on
diff --git a/salt/grains/core.py b/salt/grains/core.py
index f72ae5e10f..366be70d65 100644
--- a/salt/grains/core.py
+++ b/salt/grains/core.py
@@ -17,6 +17,7 @@ import os
 import socket
 import subprocess
 import sys
+import re
 import platform