Fixed some tab/space consistency. Removed an old bogus line of code
Merge branch 'develop' of github.com:jmcotelo/acequia into develop

Conflicts:
	acequia/twitter/listeners/twython.py