Fixed merge issue in twitterstream.py
Updated top_ten.py to use hashtag field