added -Contents-, removed inline markup from section headings
Add git.current_branch.
Support branch matching in git.latest.
Enable PEP263 pylint plugin. Fixes #7294.
Added ext_pillar Django model field access through the ORM

This external pillar will load django model fields into pillar
data.
Made roots fileserver backend symlink traversal configureable
Added CLI Example to the search function
Oops!
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #7375 from s0undt3ch/hotfix/lint

Let's start checking PEP8 in Jenkins too
Merge branch 'develop' of git://github.com/ktenney/salt into ktenney-develop

Conflicts:
	doc/faq.rst
Merge pull request #7370 from boltronics/develop

git.latest should not touch the repo on an up-to-date branch
Merge pull request #7377 from s0undt3ch/develop

Enable PEP263 pylint plugin. Fixes #7294.
Merge pull request #7380 from micahhausler/feature/django_pillar

Added ext_pillar Django model field access through the ORM
various style, spacing, spelling fixes to the file state
Merge pull request #7381 from hulu/file-state

various style, spacing, spelling fixes to the file state
Added unit and integration tests for the file.replace functions
Add paragraph on Mac OS User/Group support to 0.17.0 release notes
Deprecate `runas` usage on `salt.states.supervisord`. Refs #6961.

Additionally, on `mod_watch`, switched `restart` from `False` to `True` since that was what was being done before switching to explicit keyword arguments when calling `running`.
Deprecate `runas` usage on `salt.states.rvm`. Refs #6961.