Merge pull request #306 from ckane/master

Add 'ushlex' to the salt requirements for python, per 2014-10-30 change ...