cross-posting completed
Merge branch 'master' of https://github.com/jmorc/Reddit-Re-do