Fix pillar namespace merging not preserving order
Merge branch 'develop' of https://github.com/vahidden/salt into develop