Fix test failures

**Don't merge yet, pushing what I have fixed so far to see if the cmd.run bug that I fixed takes care of some of the other test failures**

http://jenkins.saltstack.com/job/salt-rs-rhel5/1511/