two page cheat sheet for Salt states
Merge pull request #3545 from baijum/cheatsheet

two page cheat sheet for Salt states
Merge pull request #3544 from toddejohnson/develop

Use chkconfig --type to separate sysv and xinetd parsing.  Adds xinetd ...
Add support for #3483([pydsl] Import Python definitons from included files).
Re-use the same file for JUnit xml text results instead of overriding.
Merge pull request #3547 from s0undt3ch/features/junit-compatible-tests-output

Re-use the same file for JUnit xml text results instead of overriding.
Fix #2276
fixed invalid doc example for cmd.run
updated dev contrib doc
updated instructions to make github info mostly self-contained
better travis-ci formatting
removed unnecessary sentence. clarified branch naming.
FINALLY fix #3157

I know, this should have been done a LONG time ago
Merge pull request #3548 from ydavid365/cmdrun-docfix

fixed invalid doc example for cmd.run
git format-patch link
Fix #3549
changes to tense in response to @thatch45. clarified a few things.
Merge pull request #3554 from ydavid365/saltdev-contrib-tense

Salt dev contrib update 2
Fix error where file.directory did not report changes
Fix #3282