Start on #5035, still needs support for init.sls
rename to avoid shadowing 'range' built-in
Merge pull request #5064 from hulu/range-shadowing

rename to avoid shadowing 'range' built-in
Extend get_state to return a dict with the source

And add suport to read in relative includes in states for init.sls
rename to avoid shadowing built-in type 'type'
rename to avoid shadowing built-in type 'file'
Merge pull request #5065 from hulu/type-shadowing

rename to avoid shadowing built-in type 'type'
Merge pull request #5066 from hulu/file-shadowing

rename to avoid shadowing built-in type 'file'
simplify by using list comprehensions
Merge pull request #5067 from hulu/ps-list-comp

ps module: simplify by using list comprehensions
Remove redundant os check

Fixes #5045
Merge pull request #5068 from UtahDave/develop

Remove redundant os check
Clean up relative imports via an init.sls, fix #5035
Add docs for #5035
payload.py: package -> pkg, to avoid shadowing func of same name
Merge pull request #5069 from hulu/package-shadowing

payload.py: package -> pkg, to avoid shadowing func of same name
bluez mod: address -> addr, to avoid shadowing same-named func
git mod: status -> state_by_file, to avoid shadowing same-named func
Merge pull request #5076 from hulu/git-status-shadowing

git mod: status -> state_by_file, to avoid shadowing same-named func
grub_legacy: refactor to avoid shadowing conf() function