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

This external pillar will load django model fields into pillar
data.
Added CLI Example to the search function
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
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.
Deprecate `runas` usage on `salt.states.rbenv`. Refs #6961.
Include `user` and deprecate `runas` on doctrings for `salt.states.supervisord`. Refs #6961.
Include `user` and deprecate `runas` on doctrings for `salt.states.rvm`. Refs #6961.
Deprecate `user` usage on `salt.states.rabbitmq_vhost` in favor of `owner`. Refs #6961.
Deprecate `runas` usage on `salt.states.postgres_user`. Refs #6961.
Fix doctrings and warn message for `salt.states.rvm`. Refs #6961.