Merge pull request #29 from salt-formulas/revert-5-add-proxy-rewrite-option2

Revert "add-proxy-rewrite-option - only proxy"