Merge branch 'master' of github.com:pinventado/yolanda-infoclassifier

Conflicts:
	twitter_listener.py
Fixed classifier
Merge branch 'master' of github.com:pinventado/yolanda-infoclassifier
Merge branch 'master' of github.com:pinventado/yolanda-infoclassifier