Merge remote-tracking branch 'upstream/master' into develop
Merge remote-tracking branch 'upstream/develop' into develop
List modules that aren't in the kernel folder.
Improve modules check

There are actually two improvements here.
1) this.ko.bak and that.konan won't match anymore
2) Both lines become constant time opperations rather than having to seek from
   beggining to end of each string looking for the extension.
Add whitelist capability to the loader, fix#2903
Merge pull request #2979 from s0undt3ch/develop

Set linger on ZMQ sockets before closing
Revert "Improve modules check"

This reverts commit 6a9f9fb51d04e2560435f51a35ede971528bf751.
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge pull request #2980 from jhutchins/develop

Develop
update contents to have the git policy
Add whitelist hooks to loader functions
Trim the master minion modules
Make masterminion class accept whitelist
fix loader whitelist typo in eauth
Fix more whitelist errors
Squashed commit of the following:

commit 56829e8239ee88f2672d1f749ef3b3765d190604
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 18:06:04 2012 -0700

    remove debug prints

commit ab326554b1d8851fed064231d4b9d090c9d0f6ed
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:46:02 2012 -0700

    quotes around windows installer with spaces in name

commit 49fb4043f353f4d28c9e6ad1b4e005922c7722d4
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:41:11 2012 -0700

    iiiiiii

commit 0245dc47c56de7e43a5d85e850a296309e580963
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:27:31 2012 -0700

    lkj

commit 26645963de84149c51ac5cbaef91148e94585da0
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:25:16 2012 -0700

    try again

commit ab9a5cd249c7e1558a3c87b6b4ba3933ddd043ca
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:21:41 2012 -0700

    lkjljlkjl  PLEASE work!!!

commit c024bc956dbb05a0617454d17b8b3df8d34f949a
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:15:40 2012 -0700

    lkjlkj

commit 3eb610e1fef7a1efed021bc71ba48a89ec2af23b
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:08:21 2012 -0700

    stuff

commit 59f9dd76f60799db4b68d8ccd10854a2ad01f930
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:02:34 2012 -0700

    another fix

commit 1dfe105829cbddcf37d0e029b6f8351c72a58269
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 16:59:35 2012 -0700

    moar bug fixes

commit acbaf246b1ddcd8a309fe0d6416ce61a0fe34f8b
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 16:48:58 2012 -0700

    fix moar bugs

commit 5731af3eb9b2446d6a1466918fceaa08b3331b9e
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 16:44:46 2012 -0700

    fix it

commit 532abe6b4c8691b0c67078ac76490cd83e602c9b
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 16:40:04 2012 -0700

    First try at installing windows software

commit edc05e3239c94d3b143ab63df661995782352766
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 15:45:56 2012 -0700

    try to avoid keyerrors

commit 216734db63de5e964e2c79b3eae2a203780e1eaf
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 09:48:02 2012 -0700

    fix  typo

commit dc20f405e13e06dd0f6322f1c1275e2d2bf4ba57
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 09:45:27 2012 -0700

    fix available version

commit 41669aca4f5d1f6ca4d0b089ba5753a3554a0c3e
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 09:32:17 2012 -0700

    Start filling out availabe version()

commit 3898f00202a427bb70c7e33dfd8b6eee1e9bbecd
Author: David Boucha <boucha@gmail.com>
Date:   Wed Dec 19 15:49:23 2012 -0700

    change cache file extension, update refresh_db()

commit 600696ea3e0638331f1d71fb294f982652d73799
Author: David Boucha <boucha@gmail.com>
Date:   Wed Dec 19 14:16:10 2012 -0700

    add default win repo location

commit f9fdb11efd434e4d9df2ab5b62daf6042d770230
Author: David Boucha <boucha@gmail.com>
Date:   Wed Dec 19 14:12:15 2012 -0700

    rename location of win cache file on master

commit a260eaddacbb22c4b3ae391f18cf19ef299de3d8
Author: David Boucha <boucha@gmail.com>
Date:   Wed Dec 19 13:40:27 2012 -0700

    Unify the name of the windows repo cache file
Merge pull request #2982 from UtahDave/develop

Add Alpha version of Windows Package Manager!!
Added test to support alternate SERVICE_DIR location
Merge pull request #2983 from cedwards/freebsd

Added test to support alternate SERVICE_DIR location
Add bootstrap and prioritize platform instructions to install