Merge branch 'jason' of github.com:Belltron/FanHype into jason
Merge branch 'master' into jason
Fixed two problems. 1) tweet_shrinker would error when an empty line of json was encountered. it will be ignored now. 2) tweet shrinker would error when a twitter streaming limit message was received. It will discard these now.
Fixed the discrepancy between “profile_image_url” and “profile_img_url”. Added “tweet remover” which removes tweets that don’t have the relevant hashtags.
Ignored data files.
Merge branch 'master' into jason
Merge branch 'master' into jason

Conflicts:
	tweet_util/tweet_shrinker.py
Finalizing changes.