Missing changes
Merge branch 'master' of https://github.com/ldotlopez/ldotcommons

Conflicts:
	ldotcommons/messaging/twitter.py