Merge pull request #320 from s0undt3ch/develop

Merge fixes for develop
Merge pull request #321 from saltstack/develop

Merge current develop branch into Stable for v2014.02.19