Model Rspec tests completed
Resolve merge conflict
Merge pull request #30 from newrube7/ruben/rspec

Ruben/rspec
Improve tweetstream script
Fix conflict in tweet model
Fix Trend#find_own_tweets to work better
Remove unnecessary files from scaffold. Fix routes to direct to proper controllers. Change json output from trend to be a float between -1 and 1.
Merge pull request #32 from kz363/kevin/parsetweets

Kevin/parsetweets
Fix mistake in Trend#find_own_tweets
Merge pull request #33 from kz363/kevin/trendmodel

Fix mistake in Trend#find_own_tweets
Merge branch 'master' of https://github.com/cicadas-2014/EmotionAll into add_most_active_trends
Merge pull request #31 from danielleadams/fixed_page_elements

Fixed page elements
Merge branch 'master' of https://github.com/cicadas-2014/EmotionAll into add_most_active_trends