Shamefully massive update

A large cumulative update and addition of various Salt state definitions.  Not enough time to make smaller commits.