Resolving merge conflicts, because Ryan is an idiot
Resolving merge conflicts, because Ryan is an idiot

ryanmcgrath/twython,fibears/twython,ping/twython,joebos/twython,mgrouchy/twython,vivek8943/twython,Fueled/twython,Hasimir/twython,Devyani-Divs/twython,Oire/twython,akarambir/twython