Bump version.
Merge pull request #158 from s0undt3ch/develop

Bump version.
Merge pull request #159 from saltstack/develop

Bump Stable Version to 1.5.5