Merge pull request #25 from salt-formulas/python3-new-adrian

New Python3 branch (by Adrian Chifor)