existing shoku stuff
Merge branch 'master' of https://github.com/hatboxninja/Shoku