Merge branch 'develop' of https://github.com/saltstack/salt into develop
Support block devices in virt.get_disks
Starting work on git fileserver backend
Merge pull request #3052 from torhve/virt-fixes

Support block devices in virt.get_disks
Fix the batch mode not printing the output
Add the ability to save rules to disk
Merge pull request #3055 from techhat/iptables

Add the ability to save rules to disk
Merge pull request #3054 from tchap/print-batch-results

Fix the batch mode not printing the results
Fixing a few non-salt functions which where showing up in the autodoc

These were showing up as state module functions:
    - yaml_load
    - YamlCustomLoader
Corrected doc for depclean
Updated ebuild purge to call depclean after remove
Add SMTP returner
Merge pull request #3056 from techhat/smtp_return

Add SMTP returner
Remove sentence from development virtualenv docs

Per https://github.com/saltstack/salt/pull/3042#issuecomment-11715005
Merge pull request #3057 from archtaku/docs

Remove sentence from development virtualenv docs
INitial feature commit for git backend

This adds a git fileserver backend, a few of the capabilities still
need to be hooked in, and some threading issues need to be adressed
but other than that this should be ready for testing
Merge pull request #3053 from shadowfax-chc/develop

ebuild depclean function
Add `log` to `.pylintrc` good names setting. Refs #1775.
Merge branch 'develop' of github.com:saltstack/salt into develop
Add `__context__` to `.pylintrc`