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'