remove dependency on six#318

a-detiste wants to merge 2 commits intodropbox:maindropbox/stone:mainfrom

a-detiste:maina-detiste/stone:mainCopy head branch name to clipboard