Revert "Merge branch 'develop' of https://github.com/gryffon/ringteki into cote"
Revert "Merge branch 'develop' of https://github.com/gryffon/ringteki into cote"

This reverts commit 5c220c520c2149149aff89659e7e94865f3e3103, reversing
changes made to 45520e9b03d88e88d0ce2e88d16b9bb9abaa137c.

jeremylarner/ringteki,gryffon/ringteki,gryffon/ringteki,jeremylarner/ringteki,jeremylarner/ringteki,gryffon/ringteki