show_timeouts, new default
Fix #15170 - keep comments within the hosts file
zfs doesn't support help as parameter. Changed with a question mark.
STY: Refactored common code in salt.module.pip to make it easier to maintain and simplify the code
Merge pull request #1 from saltstack/develop

Pull from #based overlords 2014-08-28
Added mdadm assemble module function
Added mdadm assemble handling to the mdadm state
Fixed how I was interpreting the return status of mdadm -E with cmd.run
BUG: Implemented consistent call to brew command in modules.brew using the admin user brew was installed with
Feature - Add support for node groups in the file tree external pillar module
Fixed bug where raid.save_config would break if mdadm.conf weren't present
Merge branch 'develop' of https://github.com/saltstack/salt into feature-ext_pillar-file_tree-nodegroups
Feature - Added dict merge function to merge node group and host pillar data instead of overwriting it
SmartOS esky: fix odd problem with zeromq linking
Adding an additional CLI argument, ret_config, which can be used to
override configuration options passed to the returner.

Adding support for ret_config to all returners.

Adding _get_options to all returners that use configurable options.

Adding return_config support to the scheduler and scheduler related management module & state.
fixing lint issues.
more lint fixes.
Checkout that kwargs exists in clear_load before attempting to pull out a kwarg.
Merge branch 'develop' of https://github.com/saltstack/salt into feature-ext_pillar-file_tree-nodegroups
Fixed lint issue with newly added code