Salt

adding updates pushed to master combining salt and non salt build with only the build flags changing what is included.