Always give saltenv argument highest priority
More refactoring and filling out
Added new nacl interface library
added some tests
Merge remote-tracking branch 'upstream/develop' into sam_2014_02_03
start ot add test
Be sure not to loose any var in case of multi macro inheritance
Adds master module
Caches loading of modules
fixed linux nic name match

linux network interface name can have hyphen strings
Ensure `master_port` in minion config matches `ret_port` in master config if running a dev version of salt on non-default ports.
Unhandled exception in salt-run #9750
bug: syndic does not return in 1 seconds

if syndic not return in 1 seconds after master's minion returned, the raw will be None, so the syndic's minions return could not be display
blockdev state, module and test
handling lack of fstab as not-error
add support to config azure management_host

Because china azure management_host isn't 'management.core.windows.net'.
Spelling and typos.
added yaml dumper that renders OrderedDict to YAML map
minion connection timeout is too small

when network is slow (e.g. 3g connection), minions in multi-master mode fail
to connect: the timeout of 1sec expires before the connection can be
established.
Fix pkg test with dots in filename

The package here is much smaller and should install quicker than the old
one.
Merge pull request #10347 from terminalmage/fix-centos-pkg-tests

Fix pkg test with dots in filename