Merge pull request #5 from tcpcloud/minion_fix

Salt-minion fix