Merge pull request #5565 from s0undt3ch/hotfix/smartos-pkgin

SmartOS also uses `pkgin`. No one using SmartOS is installing packages!?
Merge pull request #5566 from s0undt3ch/hotfix/smartos-pkgin

Make `salt.modules.pkgin` handle SmartOS properly.
Merge pull request #5568 from s0undt3ch/hotfix/smartos-pkgin

Improve pkgin regex detection
s/remooved/removed/
Merge pull request #5570 from chjohnst/tyop

s/remooved/removed/
Added rename function

Wanted to move a file, but didn't want to use os.
Merge pull request #5571 from jamesalbert/patch-2

Added rename function
merging pkgin changes
Merge remote-tracking branch 'upstream/develop' into develop
output: refactor terse formatting into a single function
output: new state output 'changes'

It displays states result in 'full' mode unless nothing changed, in
which case it displays results in 'terse' mode.
djangomod commands take env= argument
Merge pull request #5580 from iMilnb/develop

use pkg_info -Q instead of a | grep
Fix django tests
Merge pull request #5581 from multani/new-output-changes

New output changes
Merge pull request #5582 from peritus/djangomod-env-arg

djangomod commands take env= argument
DRY django.loaddata
modules.django docfix: 2nd arg is module, not file
output: fix typo introduced in 5f473b
Make it possible to run a single unit test