Merge pull request #25 from smolaon/master

added config for proxy on salt minion