added -Contents-, removed inline markup from section headings
Merge branch 'develop' of git://github.com/ktenney/salt into ktenney-develop

Conflicts:
	doc/faq.rst