Adding versionadd's for salt cli ref and salt.states.file to denote some new 0.17 features
Merge pull request #7348 from JustinCarmony/doc-version-fixes

Adding versionadd's for salt cli ref and salt.states.file
added <Contents> to faq.rst, removed inline markup from section headings
Merge branch 'salt-faq' of https://github.com/ktenney/salt into salt-faq