removed old apache salt formula
moved apache salt formula back to original (non-fork)
Merge branch 'feature/apache-salt-updates'