diff --git a/pkg/arch/PKGBUILD-git b/pkg/arch/PKGBUILD-git
index aa8b21b1d13..908c80e02ea 100755
--- a/pkg/arch/PKGBUILD-git
+++ b/pkg/arch/PKGBUILD-git
@@ -51,13 +51,13 @@ pkgver() {
 
 #build() {
 #  cd "${srcdir}/${_gitname}"
-#  python2 setup.py build 
+#  python2 setup.py build
    # no need to build setup.py install will do this
 #}
 
 package() {
   cd "${srcdir}/${_gitname}"
-  
+
   python2 setup.py install --root=${pkgdir}/ --optimize=1
 
   install -Dm644 ${srcdir}/salt/pkg/arch/salt-master.service ${pkgdir}/usr/lib/systemd/system/salt-master.service
diff --git a/pkg/arch/PKGBUILD-local b/pkg/arch/PKGBUILD-local
index ecb045d75e7..b755d9631fe 100755
--- a/pkg/arch/PKGBUILD-local
+++ b/pkg/arch/PKGBUILD-local
@@ -17,7 +17,7 @@ depends=('python2'
          'python2-psutil')
 makedepends=('git')
 provides=()
-backup=('etc/salt/master' 
+backup=('etc/salt/master'
         'etc/salt/minion')
 options=()
 srcdir="$PWD/../.."
@@ -26,9 +26,9 @@ package() {
   cd "$srcdir"
 
   python2 setup.py install --root=$pkgdir/ --optimize=1
-  
+
   mkdir -p $pkgdir/etc/rc.d/
   cp $srcdir/pkg/arch/salt-master $pkgdir/etc/rc.d/
   cp $srcdir/pkg/arch/salt-minion $pkgdir/etc/rc.d/
   chmod +x $pkgdir/etc/rc.d/*
-} 
+}
diff --git a/pkg/arch/git/PKGBUILD b/pkg/arch/git/PKGBUILD
index 3cd97eb60ab..698dd3ca07d 100755
--- a/pkg/arch/git/PKGBUILD
+++ b/pkg/arch/git/PKGBUILD
@@ -54,7 +54,7 @@ pkgver() {
 
 #build() {
 #  cd "${srcdir}/${_gitname}"
-#  python2 setup.py build 
+#  python2 setup.py build
    # no need to build setup.py install will do this
 #}
 
diff --git a/pkg/arch/salt-api_PKGBUILD b/pkg/arch/salt-api_PKGBUILD
index 282a1e17fd0..724a584b806 100644
--- a/pkg/arch/salt-api_PKGBUILD
+++ b/pkg/arch/salt-api_PKGBUILD
@@ -26,7 +26,7 @@ md5sums=('e9239a7184ced5d426696735456ee829'
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   python2 setup.py install --root=${pkgdir}/ --optimize=1
-  
+
   install -Dm644 ${srcdir}/salt-api.service ${pkgdir}/usr/lib/systemd/system/salt-api.service
-  
+
 }
diff --git a/pkg/arch/salt-api_PKGBUILD-git b/pkg/arch/salt-api_PKGBUILD-git
index 65b0d8635e4..067578192ea 100644
--- a/pkg/arch/salt-api_PKGBUILD-git
+++ b/pkg/arch/salt-api_PKGBUILD-git
@@ -43,7 +43,7 @@ pkgver() {
 
 #build() {
 #  cd "${srcdir}/${_gitname}"
-#  python2 setup.py build 
+#  python2 setup.py build
    # no need to build setup.py install will do this
 #}
 
@@ -51,7 +51,7 @@ package() {
   cd "${srcdir}/${_gitname}"
   export USE_SETUPTOOLS=true
   python2 setup.py install --root=${pkgdir}/ --optimize=1
-  
+
   install -Dm644 ${srcdir}/salt-api/pkg/salt-api.service ${pkgdir}/usr/lib/systemd/system/salt-api.service
 
   # remove vcs leftovers
diff --git a/pkg/fish-completions/salt-syndic.fish b/pkg/fish-completions/salt-syndic.fish
index 429bc7e309b..1698778825b 100644
--- a/pkg/fish-completions/salt-syndic.fish
+++ b/pkg/fish-completions/salt-syndic.fish
@@ -3,4 +3,4 @@
 
 # hack to load functions from salt_common completion
 complete --do-complete='salt_common --' >/dev/null
- 
+
diff --git a/pkg/fish-completions/salt_common.fish b/pkg/fish-completions/salt_common.fish
index b6b54459ae1..ad5b04da060 100644
--- a/pkg/fish-completions/salt_common.fish
+++ b/pkg/fish-completions/salt_common.fish
@@ -173,7 +173,7 @@ end
 
 function __fish_salt_save_first_commandline_token_not_matching_args_to
 	if status --is-interactive
-		set -l cli (commandline -pco) 
+		set -l cli (commandline -pco)
 		for i in $cli
 			if echo "$i" | grep -Ev (__fish_salt_join '|' $argv)
 				set -g $argv[1] $i
@@ -257,7 +257,7 @@ set -g __fish_salt_format_options --no-color --log-level=quiet
 
 function __fish_salt_exec
 	set -l program (__fish_salt_program)
-	set -l exe $program $__fish_salt_format_options $__fish_salt_format_options_temp  
+	set -l exe $program $__fish_salt_format_options $__fish_salt_format_options_temp
 	if [ $program = salt ]
 		set exe $exe (__fish_salt_minion)
 	end
@@ -350,7 +350,7 @@ function __fish_salt_argspec_function
 end
 
 function __fish_salt_argspec_args
-	__fish_salt_lines_between '^\s*args:' '^\s*defaults:' | grep -v ':' 
+	__fish_salt_lines_between '^\s*args:' '^\s*defaults:' | grep -v ':'
 end
 
 function __fish_salt_list_arg_name
@@ -431,7 +431,7 @@ function __fish_salt_prefix_with_arg_name
 	if [ $arg_name != '_' ]
 		sed "p;s/^/$arg_name=/g"
 	else
-		# leave stdout as is; don't remove this line, because if construction 
+		# leave stdout as is; don't remove this line, because if construction
 		# clears stdout if condition fails
 		tee
 	end
diff --git a/pkg/macports/ports/sysutils/salt/Portfile b/pkg/macports/ports/sysutils/salt/Portfile
index 24ff85bfde4..34ec6ee2533 100644
--- a/pkg/macports/ports/sysutils/salt/Portfile
+++ b/pkg/macports/ports/sysutils/salt/Portfile
@@ -91,7 +91,7 @@ This port configures a LaunchItem for salt-minion.
 It also installs LaunchItems for the salt-master and the salt-syndic.
 
 To start the salt-master via launchd, run
-    
+
 sudo launchctl load -w /Library/LaunchDaemons/com.saltstack.salt.master.plist
 
 To start the salt-syndic via launchd, run
diff --git a/pkg/osx/README.md b/pkg/osx/README.md
index 16e3f29d2d6..b9eb6759a29 100644
--- a/pkg/osx/README.md
+++ b/pkg/osx/README.md
@@ -6,7 +6,7 @@ Salt runs well on the Mac, but does have some limitations.
 
 In this directory you will find scripts and collateral to build an OSX
 .pkg-style package that uses a custom-built Python.  This process has
-been tested on Mac OSX Lion (10.7) and following. 
+been tested on Mac OSX Lion (10.7) and following.
 
 In addition, because of changes in launchd from version
 to version of the OS, a simpler approach is taken for
diff --git a/pkg/osx/build.sh b/pkg/osx/build.sh
index 474d3927ed8..6770f9d9389 100755
--- a/pkg/osx/build.sh
+++ b/pkg/osx/build.sh
@@ -18,7 +18,7 @@
 #     This script can be passed 3 parameters
 #         $1 : <package dir> : the staging area for the package
 #                              defaults to /tmp/salt-pkg
-#         $2 : <version> : the version of salt to build 
+#         $2 : <version> : the version of salt to build
 #                          (a git tag, not a branch)
 #                          (defaults to git-repo state)
 #
diff --git a/pkg/osx/build_pkg.sh b/pkg/osx/build_pkg.sh
index 413d42ca528..c08093030c3 100755
--- a/pkg/osx/build_pkg.sh
+++ b/pkg/osx/build_pkg.sh
@@ -127,7 +127,7 @@ cp $PKGRESOURCES/scripts/com.saltstack.salt.syndic.plist $PKGDIR/Library/LaunchD
 cp $PKGRESOURCES/scripts/com.saltstack.salt.api.plist $PKGDIR/Library/LaunchDaemons
 
 ############################################################################
-# Remove pkg-config files from the distro 
+# Remove pkg-config files from the distro
 ############################################################################
 
 echo -n -e "\033]0;Build_Pkg: Remove pkg-config files\007"
diff --git a/pkg/rpm/README.fedora b/pkg/rpm/README.fedora
index 68c9ef55b3c..276a232da18 100644
--- a/pkg/rpm/README.fedora
+++ b/pkg/rpm/README.fedora
@@ -1,11 +1,11 @@
 These packages are *optional* dependencies for salt. By default, they are not included in the salt RPMs.
 Install any of these packages to enable the functionality within salt.
 
-MySQL-python 
-libvirt-python 
+MySQL-python
+libvirt-python
 python-mako
 pymongo
 python-redis / redis
 
-A semi-canonical list of the optional salt modules can be found at 
+A semi-canonical list of the optional salt modules can be found at
 https://github.com/saltstack/salt/blob/develop/doc/conf.py#L30
diff --git a/pkg/rpm/salt-api b/pkg/rpm/salt-api
index 0d172bb3b14..b640a4360fb 100755
--- a/pkg/rpm/salt-api
+++ b/pkg/rpm/salt-api
@@ -20,7 +20,7 @@
 
 # chkconfig header
 
-# chkconfig: 345 99 99 
+# chkconfig: 345 99 99
 # description:  This is a daemon that controls the Salt API.
 #
 # processname: /usr/bin/salt-api
@@ -40,7 +40,7 @@ DEBIAN_VERSION=/etc/debian_version
 SUSE_RELEASE=/etc/SuSE-release
 # Source function library.
 if [ -f $DEBIAN_VERSION ]; then
-   break   
+   break
 elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then
     . /etc/rc.status
 else
@@ -61,17 +61,17 @@ start() {
         rc_status -v
     elif [ -e $DEBIAN_VERSION ]; then
         if [ -f $LOCKFILE ]; then
-            echo -n "already started, lock file found" 
+            echo -n "already started, lock file found"
             RETVAL=1
         elif $PYTHON $SALTAPI; then
             echo -n "OK"
             RETVAL=0
         fi
     else
-        if status $PROCESS &> /dev/null; then 
+        if status $PROCESS &> /dev/null; then
             failure "Already running."
             RETVAL=1
-        else 
+        else
             daemon --pidfile=$PID_FILE --check $SERVICE $SALTAPI $CONFIG_ARGS
             RETVAL=$?
             [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE
diff --git a/pkg/rpm/salt-master b/pkg/rpm/salt-master
index dd1a1afc702..bcb308eb78f 100755
--- a/pkg/rpm/salt-master
+++ b/pkg/rpm/salt-master
@@ -28,7 +28,7 @@ DEBIAN_VERSION=/etc/debian_version
 SUSE_RELEASE=/etc/SuSE-release
 # Source function library.
 if [ -f $DEBIAN_VERSION ]; then
-   break   
+   break
 elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then
     . /etc/rc.status
 else
@@ -56,7 +56,7 @@ start() {
         rc_status -v
     elif [ -e $DEBIAN_VERSION ]; then
         if [ -f $LOCKFILE ]; then
-            echo -n "already started, lock file found" 
+            echo -n "already started, lock file found"
             RETVAL=1
         elif $PYTHON $SALTMASTER -d $MASTER_ARGS >& /dev/null; then
             echo -n "OK"
diff --git a/pkg/rpm/salt-syndic b/pkg/rpm/salt-syndic
index fa0493401eb..6de5b3e4e3d 100755
--- a/pkg/rpm/salt-syndic
+++ b/pkg/rpm/salt-syndic
@@ -8,7 +8,7 @@
 ### BEGIN INIT INFO
 # Provides:          salt-syndic
 # Required-Start:    $all
-# Required-Stop:     
+# Required-Stop:
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Salt syndic master-minion passthrough daemon
@@ -19,7 +19,7 @@
 
 # chkconfig header
 
-# chkconfig: - 99 99 
+# chkconfig: - 99 99
 # description:  This is a the Salt syndic daemon that enables Salt master-minion remote control passthrough.
 #
 # processname: /usr/bin/salt-syndic
@@ -29,7 +29,7 @@ DEBIAN_VERSION=/etc/debian_version
 SUSE_RELEASE=/etc/SuSE-release
 # Source function library.
 if [ -f $DEBIAN_VERSION ]; then
-   break   
+   break
 elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then
     . /etc/rc.status
 else
@@ -57,7 +57,7 @@ start() {
         rc_status -v
     elif [ -e $DEBIAN_VERSION ]; then
         if [ -f $LOCKFILE ]; then
-            echo -n "already started, lock file found" 
+            echo -n "already started, lock file found"
             RETVAL=1
         elif $PYTHON $SALTSYNDIC -d $SYNDIC_ARGS >& /dev/null; then
             echo -n "OK"
diff --git a/pkg/salt.bash b/pkg/salt.bash
index 521b5cf7ca1..7b178ce1b15 100644
--- a/pkg/salt.bash
+++ b/pkg/salt.bash
@@ -13,7 +13,7 @@
 
 
 _salt_get_grains(){
-    if [ "$1" = 'local' ] ; then 
+    if [ "$1" = 'local' ] ; then
         salt-call --out=txt -- grains.ls | sed  's/^.*\[//' | tr -d ",']" |sed 's:\([a-z0-9]\) :\1\: :g'
     else
       salt '*' --timeout 2 --out=txt -- grains.ls | sed  's/^.*\[//' | tr -d ",']" |sed 's:\([a-z0-9]\) :\1\: :g'
@@ -22,15 +22,15 @@ _salt_get_grains(){
 
 _salt_get_grain_values(){
     if [ "$1" = 'local' ] ; then
-        salt-call --out=txt -- grains.item $1 |sed 's/^\S*:\s//' |grep -v '^\s*$' 
+        salt-call --out=txt -- grains.item $1 |sed 's/^\S*:\s//' |grep -v '^\s*$'
     else
-        salt '*' --timeout 2 --out=txt -- grains.item $1 |sed 's/^\S*:\s//' |grep -v '^\s*$' 
+        salt '*' --timeout 2 --out=txt -- grains.item $1 |sed 's/^\S*:\s//' |grep -v '^\s*$'
     fi
 }
 
 
 _salt(){
-    local cur prev opts _salt_grains _salt_coms pprev ppprev 
+    local cur prev opts _salt_grains _salt_coms pprev ppprev
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
@@ -62,7 +62,7 @@ _salt(){
         return 0
     fi
     ;;
-    esac 
+    esac
     case "${ppprev}" in
     -G|--grain|--grain-pcre)
         if [ "${prev}" = ":" ]; then
@@ -70,17 +70,17 @@ _salt(){
         return 0
         fi
     ;;
-    esac  
- 
+    esac
+
     if [ "${cur}" = "=" ] && [[ "${prev}" == --* ]]; then
-       cur="" 
+       cur=""
     fi
     if [ "${prev}" = "=" ] && [[ "${pprev}" == --* ]]; then
        prev="${pprev}"
     fi
- 
+
    case "${prev}" in
- 
+
      -c|--config)
         COMPREPLY=($(compgen -f -- ${cur}))
         return 0
@@ -89,12 +89,12 @@ _salt(){
         COMPREPLY=($(compgen -W "\'*\' ${opts} `salt-key --no-color -l acc`" -- ${cur}))
         return 0
         ;;
-     -E|--pcre) 
+     -E|--pcre)
         COMPREPLY=($(compgen -W "`salt-key --no-color -l acc`" -- ${cur}))
         return 0
         ;;
      -G|--grain|--grain-pcre)
-        COMPREPLY=($(compgen -W "$(_salt_get_grains)" -- ${cur})) 
+        COMPREPLY=($(compgen -W "$(_salt_get_grains)" -- ${cur}))
         return 0
 	;;
      -C|--compound)
@@ -109,10 +109,10 @@ _salt(){
         COMPREPLY=($(compgen -W "1 2 3 4 5 6 7 8 9 10 15 20 30 40 50 60 70 80 90 100 120 150 200"))
         return 0
         ;;
-     -N|--nodegroup)  
+     -N|--nodegroup)
 	    MASTER_CONFIG='/etc/salt/master'
-        COMPREPLY=($(compgen -W "`awk -F ':'  'BEGIN {print_line = 0};  /^nodegroups/ {print_line = 1;getline } print_line && /^  */ {print $1} /^[^ ]/ {print_line = 0}' <${MASTER_CONFIG}`" -- ${cur})) 
-        return 0  
+        COMPREPLY=($(compgen -W "`awk -F ':'  'BEGIN {print_line = 0};  /^nodegroups/ {print_line = 1;getline } print_line && /^  */ {print $1} /^[^ ]/ {print_line = 0}' <${MASTER_CONFIG}`" -- ${cur}))
+        return 0
      ;;
     esac
 
@@ -133,8 +133,8 @@ _saltkey(){
     prev="${COMP_WORDS[COMP_CWORD-1]}"
     opts="-c --config-dir= -h --help --version --versions-report -q --quiet \
           -y --yes --gen-keys= --gen-keys-dir= --keysize= --key-logfile= \
-          -l --list= -L --list-all -a --accept= -A --accept-all \ 
-          -r --reject= -R --reject-all -p --print= -P --print-all \ 
+          -l --list= -L --list-all -a --accept= -A --accept-all \
+          -r --reject= -R --reject-all -p --print= -P --print-all \
           -d --delete= -D --delete-all -f --finger= -F --finger-all \
           --out=pprint --out=yaml --out=overstatestage --out=json --out=raw \
           --out=highstate --out=key --out=txt --no-color --out-indent= "
@@ -150,13 +150,13 @@ _saltkey(){
     fi
 
     if [ "${cur}" = "=" ] && [[ "${prev}" == --* ]]; then
-       cur="" 
+       cur=""
     fi
     if [ "${prev}" = "=" ] && [[ "${pprev}" == --* ]]; then
        prev="${pprev}"
     fi
 
-    case "${prev}" in 
+    case "${prev}" in
      -a|--accept)
         COMPREPLY=($(compgen -W "$(salt-key -l un --no-color; salt-key -l rej --no-color)" -- ${cur}))
         return 0
@@ -177,7 +177,7 @@ _saltkey(){
         COMPREPLY=($(compgen -W "2048 3072 4096 5120 6144" -- ${cur}))
         return 0
         ;;
-     --gen-keys) 
+     --gen-keys)
         return 0
         ;;
      --gen-keys-dir)
@@ -221,14 +221,14 @@ _saltcall(){
         COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
         return 0
     fi
-    
+
     if [ "${cur}" = "=" ] && [[ ${prev} == --* ]]; then
        cur=""
     fi
     if [ "${prev}" = "=" ] && [[ ${pprev} == --* ]]; then
        prev="${pprev}"
     fi
-    
+
     case ${prev} in
         -m|--module-dirs)
                 COMPREPLY=( $(compgen -d ${cur} ))
@@ -262,7 +262,7 @@ _saltcp(){
     prev="${COMP_WORDS[COMP_CWORD-1]}"
     opts="-t --timeout= -s --static -b --batch= --batch-size= \
           -h --help --version --versions-report -c --config-dir= \
-          -E --pcre -L --list -G --grain --grain-pcre -N --nodegroup \ 
+          -E --pcre -L --list -G --grain --grain-pcre -N --nodegroup \
           -R --range -C --compound -I --pillar \
           --out=pprint --out=yaml --out=overstatestage --out=json --out=raw \
           --out=highstate --out=key --out=txt --no-color --out-indent= "
@@ -270,19 +270,19 @@ _saltcp(){
         COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
         return 0
     fi
-    
+
     if [ "${cur}" = "=" ] && [[ "${prev}" == --* ]]; then
-       cur="" 
+       cur=""
     fi
     if [ "${prev}" = "=" ] && [[ "${pprev}" == --* ]]; then
        prev=${pprev}
     fi
-    
+
     case ${prev} in
  	salt-cp)
 	    COMPREPLY=($(compgen -W "${opts} `salt-key -l acc --no-color`" -- ${cur}))
 	    return 0
-	;;       
+	;;
         -t|--timeout)
 	    # those numbers are just a hint
             COMPREPLY=($(compgen -W "2 3 4 8 10 15 20 25 30 40 60 90 120 180 240 300" -- ${cur} ))
@@ -303,7 +303,7 @@ _saltcp(){
 	    return 0
 	;;
 	-G|--grain|--grain-pcre)
-            COMPREPLY=($(compgen -W "$(_salt_get_grains)" -- ${cur})) 
+            COMPREPLY=($(compgen -W "$(_salt_get_grains)" -- ${cur}))
             return 0
 	    ;;
 	    # FIXME
@@ -320,7 +320,7 @@ _saltcp(){
 	    return 0
 	;;
     esac
-   
+
    # default is using opts:
    COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
 }
diff --git a/pkg/salt.ufw b/pkg/salt.ufw
index 8784f790f09..9dd120ca98d 100644
--- a/pkg/salt.ufw
+++ b/pkg/salt.ufw
@@ -2,5 +2,5 @@
 # firewall rules to systems with UFW.  Activate with 'ufw allow salt'
 [Salt]
 title=salt
-description=fast and powerful configuration management and remote execution 
+description=fast and powerful configuration management and remote execution
 ports=4505,4506/tcp
diff --git a/pkg/shar/salt.sh b/pkg/shar/salt.sh
index 40e3b119038..034b55ee193 100644
--- a/pkg/shar/salt.sh
+++ b/pkg/shar/salt.sh
@@ -21,7 +21,7 @@ if test -z "$pyver"; then
     elif test -f /etc/arch-release; then
         python=python2
     fi
-    
+
     if test -z "$pyver"; then
         test -z "$python" && python=python
         pyver=`/usr/bin/env $python -V 2>&1 | cut -f2 -d' ' | cut -f1,2 -d.`
diff --git a/pkg/suse/README.suse b/pkg/suse/README.suse
index 770d543eccf..f6fa2e0d3a7 100644
--- a/pkg/suse/README.suse
+++ b/pkg/suse/README.suse
@@ -2,10 +2,10 @@ These packages are *optional* dependencies for salt. By default, they are not in
 Install any of these packages to enable the functionality within salt.
 
 python-psutils
-python-mysql 
+python-mysql
 python-mako
 python-pymongo
 python-redis / redis
 
-A semi-canonical list of the optional salt modules can be found at 
+A semi-canonical list of the optional salt modules can be found at
 https://github.com/saltstack/salt/blob/develop/doc/conf.py#L30
diff --git a/pkg/suse/salt-master b/pkg/suse/salt-master
index 86c5fac1705..35f5e3cf397 100644
--- a/pkg/suse/salt-master
+++ b/pkg/suse/salt-master
@@ -30,7 +30,7 @@ DEBIAN_VERSION=/etc/debian_version
 SUSE_RELEASE=/etc/SuSE-release
 # Source function library.
 if [ -f $DEBIAN_VERSION ]; then
-   break   
+   break
 elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then
     . /etc/rc.status
 else
@@ -58,7 +58,7 @@ start() {
         rc_status -v
     elif [ -e $DEBIAN_VERSION ]; then
         if [ -f $LOCKFILE ]; then
-            echo -n "already started, lock file found" 
+            echo -n "already started, lock file found"
             RETVAL=1
         elif $PYTHON $SALTMASTER -d $MASTER_ARGS >& /dev/null; then
             echo -n "OK"
diff --git a/pkg/suse/salt-syndic b/pkg/suse/salt-syndic
index bcae9662257..1a3944f68b2 100644
--- a/pkg/suse/salt-syndic
+++ b/pkg/suse/salt-syndic
@@ -21,7 +21,7 @@
 
 # chkconfig header
 
-# chkconfig: - 99 99 
+# chkconfig: - 99 99
 # description:  This is a the Salt syndic daemon that enables Salt master-minion remote control passthrough.
 #
 # processname: /usr/bin/salt-syndic
@@ -31,7 +31,7 @@ DEBIAN_VERSION=/etc/debian_version
 SUSE_RELEASE=/etc/SuSE-release
 # Source function library.
 if [ -f $DEBIAN_VERSION ]; then
-   break   
+   break
 elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then
     . /etc/rc.status
 else
@@ -59,7 +59,7 @@ start() {
         rc_status -v
     elif [ -e $DEBIAN_VERSION ]; then
         if [ -f $LOCKFILE ]; then
-            echo -n "already started, lock file found" 
+            echo -n "already started, lock file found"
             RETVAL=1
         elif $PYTHON $SALTSYNDIC -d $SYNDIC_ARGS >& /dev/null; then
             echo -n "OK"
diff --git a/pkg/suse/salt.changes b/pkg/suse/salt.changes
index 0ddc2aaa533..8182a6c40b9 100644
--- a/pkg/suse/salt.changes
+++ b/pkg/suse/salt.changes
@@ -2,9 +2,9 @@
 Sat May 23 18:31:44 UTC 2015 - aboe76@gmail.com
 
 - New Bugfix release 2015.5.1
-  salt.runners.cloud.action() has changed the fun keyword argument to func. 
+  salt.runners.cloud.action() has changed the fun keyword argument to func.
   Please update any calls to this function in the cloud runner.
-  
+
   for more details:
   http://docs.saltstack.com/en/latest/topics/releases/2015.5.1.html
 
@@ -92,8 +92,8 @@ Changes:
 + Fixed argument passing to the reactor
 + Fixed glibc caching to prevent bug where salt-minion getaddrinfo in dns_check() never got updated nameservers
 Known Issues:
-+ In multimaster mode, a minion may become temporarily unresponsive if modules or pillars are refreshed at the 
-same time that one or more masters are down. This can be worked around by setting 'auth_timeout' and 'auth_tries' 
++ In multimaster mode, a minion may become temporarily unresponsive if modules or pillars are refreshed at the
+same time that one or more masters are down. This can be worked around by setting 'auth_timeout' and 'auth_tries'
 down to shorter periods.
 
 -------------------------------------------------------------------
@@ -187,11 +187,11 @@ Thu Feb 12 19:35:34 UTC 2015 - aboe76@gmail.com
 - keep sle 11 sp3 support.
 + Fix erroneous warnings for systemd service enabled check (issue 19606)
 + Fix FreeBSD kernel module loading, listing, and persistence kmod (issue 197151, issue 19682)
-+ Allow case-sensitive npm package names in the npm state. This may break behavior 
-  for people expecting the state to lowercase their npm package names for them. 
++ Allow case-sensitive npm package names in the npm state. This may break behavior
+  for people expecting the state to lowercase their npm package names for them.
   The npm module was never affected by mandatory lowercasing. (issue 20329)
-+ Deprecate the activate parameter for pip.install for both the module and the state. 
-  If bin_env is given and points to a virtualenv, there is no need to activate that virtualenv 
++ Deprecate the activate parameter for pip.install for both the module and the state.
+  If bin_env is given and points to a virtualenv, there is no need to activate that virtualenv
   in a shell for pip to install to the virtualenv.
 + Fix a file-locking bug in gitfs (issue 18839)
 
@@ -261,7 +261,7 @@ Mon Nov  3 21:35:31 UTC 2014 - aboe76@gmail.com
    + New hgfs Features
    	+ mountpoints support
    + New svnfs Features:
-    + mountpoints 
+    + mountpoints
    + minionfs Featuressupport
     + mountpoints
  - New Salt Modules:
@@ -295,7 +295,7 @@ Thu Oct 16 19:26:57 UTC 2014 - aboe76@gmail.com
 - Updated to 2014.1.13 a bugfix release on 2014.1.12
   + fix module run exit code (issue 16420)
   + salt cloud Check the exit status code of scp before assuming it has failed. (issue 16599)
-  
+
 
 -------------------------------------------------------------------
 Fri Oct 10 18:47:07 UTC 2014 - aboe76@gmail.com
@@ -316,7 +316,7 @@ Wed Sep 10 18:10:50 UTC 2014 - aboe76@gmail.com
   + Fix json outputter null case
   + Fix for minion error if one of multiple masters are down (issue 14099)
   + Updated the use-forking-daemon.patch with the right version
-  
+
 -------------------------------------------------------------------
 Mon Aug 18 13:06:07 UTC 2014 - tserong@suse.com
 
@@ -390,7 +390,7 @@ Sat Jul 19 07:58:18 UTC 2014 - aboe76@gmail.com
 Thu Jul 10 18:25:05 UTC 2014 - aboe76@gmail.com
 
 - Update to 2014.7
-  This release was a hotfix release for the regression listed above which was present in the 2014.1.6 
+  This release was a hotfix release for the regression listed above which was present in the 2014.1.6
 - Fix batch mode regression (issue 14046)
 
 -------------------------------------------------------------------
@@ -510,11 +510,11 @@ Thu Apr 17 18:06:56 UTC 2014 - aboe76@gmail.com
   - Fix git.latest with test=True (issue 11595)
   - Fix file.check_perms hardcoded follow_symlinks (issue 11387)
   - Fix certain pkg states for RHEL5/Cent5 machines (issue 11719)
-- Packaging: 
+- Packaging:
   - python-psutil depencies (more functional modules out of the box)
   - python-yaml depencies (more functional modules out of the box)
   - python-requests depencies (salt-cloud)
-  
+
 
 -------------------------------------------------------------------
 Wed Mar 19 19:29:13 UTC 2014 - aboe76@gmail.com
@@ -676,7 +676,7 @@ Thu Nov 14 22:05:06 UTC 2013 - aboe76@gmail.com
   - Fix for matching minions under syndics (issue 7671)
   - Improve exception handling for missing ID (issue 8259)
   - Add configuration option for minion_id_caching
-  - Fix open mode auth errors (issue 8402)  
+  - Fix open mode auth errors (issue 8402)
 
 -------------------------------------------------------------------
 Sun Nov 10 07:52:54 UTC 2013 - aboe76@gmail.com
@@ -795,30 +795,30 @@ Thu Sep 19 17:18:06 UTC 2013 - aboe76@gmail.com
   Minor features:
   - 0.17.0 release wil be last release for 0.XX.X numbering system
     Next release will be <Year>.<Month>.<Minor>
-     
+
 -------------------------------------------------------------------
 Sat Sep  7 22:44:41 UTC 2013 - aboe76@gmail.com
 
 - Update 0.16.4 bugfix release:
   - Multiple documentation improvements/additions
   - Added the osfinger and osarch grains
-  - Fix bug in :mod:`hg.latest <salt.states.hg.latest>` state 
+  - Fix bug in :mod:`hg.latest <salt.states.hg.latest>` state
   that would erroneously delete directories (:issue:`6661`)
-  - Fix bug related to pid not existing for 
+  - Fix bug related to pid not existing for
   :mod:`ps.top <salt.modules.ps.top>` (:issue:`6679`)
-  - Fix regression in :mod:`MySQL returner <salt.returners.mysql>` 
+  - Fix regression in :mod:`MySQL returner <salt.returners.mysql>`
   (:issue:`6695`)
   - Fix IP addresses grains (ipv4 and ipv6) to include all addresses
   (:issue:`6656`)
   - Fix regression preventing authenticated FTP (:issue:`6733`)
-  - Fix :mod:`file.contains <salt.modules.file.contains>` on values 
+  - Fix :mod:`file.contains <salt.modules.file.contains>` on values
   YAML parses as non-string (:issue:`6817`)
-  - Fix :mod:`file.get_gid <salt.modules.file.get_gid>`, 
-  :mod:`file.get_uid <salt.modules.file.get_uid>`, and 
-  :mod:`file.chown <salt.modules.file.chown>` for broken symlinks 
+  - Fix :mod:`file.get_gid <salt.modules.file.get_gid>`,
+  :mod:`file.get_uid <salt.modules.file.get_uid>`, and
+  :mod:`file.chown <salt.modules.file.chown>` for broken symlinks
   (:issue:`6826`)
   - Fix comment for service reloads in service state (:issue:`6851`)
-  
+
 -------------------------------------------------------------------
 Fri Aug  9 18:08:12 UTC 2013 - aboe76@gmail.com
 
@@ -881,7 +881,7 @@ Mon Jul 29 18:06:03 UTC 2013 - aboe76@gmail.com
   - http authentication issues fixed  #6356
   - warning of deprecation runas in favor of user
 - more information at https://github.com/saltstack/salt/commits/v0.16.1
-  
+
 -------------------------------------------------------------------
 Fri Jul  5 21:24:21 UTC 2013 - aboe76@gmail.com
 
@@ -946,7 +946,7 @@ Wed May 29 16:10:42 UTC 2013 - aboe76@gmail.com
   xinetd service name not appended
   virt-module uses qemu-img
   publish.publish returns same info as salt-master
-  updated gitfs module  
+  updated gitfs module
 
 -------------------------------------------------------------------
 Mon May 27 20:42:06 UTC 2013 - aboe76@gmail.com
@@ -1046,7 +1046,7 @@ Wed Mar 13 22:04:43 UTC 2013 - aboe76@gmail.com
 -------------------------------------------------------------------
 Mon Feb 25 17:52:59 UTC 2013 - aboe76@gmail.com
 
-- Updated spec file, postun removal of init.d files 
+- Updated spec file, postun removal of init.d files
 
 -------------------------------------------------------------------
 Sat Feb 16 09:25:30 UTC 2013 - aboe76@gmail.com
diff --git a/pkg/windows/buildenv/conf/minion b/pkg/windows/buildenv/conf/minion
index fbb9769b06a..31c89605d13 100644
--- a/pkg/windows/buildenv/conf/minion
+++ b/pkg/windows/buildenv/conf/minion
@@ -91,7 +91,7 @@ pki_dir: /conf/pki/minion
 # seconds, between those reconnection attempts.
 #acceptance_wait_time: 10
 
-# If this is set, the time between reconnection attempts will increase by 
+# If this is set, the time between reconnection attempts will increase by
 # acceptance_wait_time seconds per iteration, up to this maximum. If this
 # is not set, the time between reconnection attempts will stay constant.
 #acceptance_wait_time_max: None
@@ -192,11 +192,11 @@ pki_dir: /conf/pki/minion
 # Run states when the minion daemon starts. To enable, set startup_states to:
 # 'highstate' -- Execute state.highstate
 # 'sls' -- Read in the sls_list option and execute the named sls files
-# 'top' -- Read top_file option and execute based on that file on the Master 
+# 'top' -- Read top_file option and execute based on that file on the Master
 #startup_states: ''
 #
 # list of states to run when the minion starts up if startup_states is 'sls'
-#sls_list: 
+#sls_list:
 #  - edit.vim
 #  - hyper
 #
@@ -377,12 +377,12 @@ pki_dir: /conf/pki/minion
 # without informing either party that their connection has been taken away.
 # Enabling TCP Keepalives prevents this from happening.
 #
-# Overall state of TCP Keepalives, enable (1 or True), disable (0 or False) 
+# Overall state of TCP Keepalives, enable (1 or True), disable (0 or False)
 # or leave to the OS defaults (-1), on Linux, typically disabled. Default True, enabled.
 #tcp_keepalive: True
 #
 # How long before the first keepalive should be sent in seconds. Default 300
-# to send the first keepalive after 5 minutes, OS default (-1) is typically 7200 seconds 
+# to send the first keepalive after 5 minutes, OS default (-1) is typically 7200 seconds
 # on Linux see /proc/sys/net/ipv4/tcp_keepalive_time.
 #tcp_keepalive_idle: 300
 #
@@ -390,8 +390,8 @@ pki_dir: /conf/pki/minion
 # to use OS defaults, typically 9 on Linux, see /proc/sys/net/ipv4/tcp_keepalive_probes.
 #tcp_keepalive_cnt: -1
 #
-# How often, in seconds, to send keepalives after the first one. Default -1 to 
-# use OS defaults, typically 75 seconds on Linux, see 
+# How often, in seconds, to send keepalives after the first one. Default -1 to
+# use OS defaults, typically 75 seconds on Linux, see
 # /proc/sys/net/ipv4/tcp_keepalive_intvl.
 #tcp_keepalive_intvl: -1
 
diff --git a/pkg/windows/installer/LICENSE.txt b/pkg/windows/installer/LICENSE.txt
index 65fa8b46c96..4bc9a75ecdb 100644
--- a/pkg/windows/installer/LICENSE.txt
+++ b/pkg/windows/installer/LICENSE.txt
@@ -1,4 +1,4 @@
-   Salt - Remote execution system   
+   Salt - Remote execution system
 
    Copyright 2011 Thomas S Hatch
 
diff --git a/pkg/windows/installer/README.txt b/pkg/windows/installer/README.txt
index 6ba36962087..10305c9d22b 100644
--- a/pkg/windows/installer/README.txt
+++ b/pkg/windows/installer/README.txt
@@ -32,10 +32,10 @@ modification, Salt can be fine-tuned to meet specific needs.
 Granular Controls
 =================
 
-Salt also introduces powerful granular controls to the realm of remote execution. 
-By default, commands are executed in parallel. However, using more advanced 
-options, commands can be executed in batch groups or even in serial. By using 
-simple built-in filters or regular expression matching, systems can be targeted by 
+Salt also introduces powerful granular controls to the realm of remote execution.
+By default, commands are executed in parallel. However, using more advanced
+options, commands can be executed in batch groups or even in serial. By using
+simple built-in filters or regular expression matching, systems can be targeted by
 hostname, metadata or system properties such as number of cpus or OS type.
 
 Building on Proven Technology