Merge branch 'develop' of git://github.com/saltstack/salt into develop

Conflicts:
	salt/grains/core.py

.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

salt/grains/core.py

@@ -17,6 +17,7 @@ import os
 import socket
 import subprocess
 import sys
+import re
 import platform