General updates to work better with the salt update

It was tested to use php 5.5 but it turns out that Magento freaks on that in a place like creation of a new store do to a `preg_replace` flag of `\e`.  Other changes are more refactors then changes