A lot of really tedious work on this tonight, but I made it through the whole class, another set of eyes would be great :)
Merge branch 'python' of https://github.com/php-loep/twitter into python