Trend/tweet spec WIP
Merge branch 'master' of https://github.com/cicadas-2014/EmotionAll into ruben/controller_specs
Merge pull request #65 from newrube7/ruben/controller_specs

Ruben/controller specs
Trim a lot of code fat
Merge branch 'master' of http://www.github.com/cicadas-2014/EmotionAll into ninefold