Added workaround for https://github.com/saltstack/halite/issues/54
Where catch exception and strip the 'tok' field and then re json
Merge remote-tracking branch 'github/master'