Reorganize variables

They're now named the same thing as in salt. This should make moving over easier.

It's still using it's own localsettings template, but I also wrote a script for sycning changes to the salt localsettings file to our own equivalent copy, and soon I'll move over to using that.