Remove unused jasmine files
Move trend and other UI elements around
merge with ninefold branch
Move elements around
Change about anchor tag location
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
Merge pull request #66 from kz363/ninefold

Trim code fat
merge from upstream
make map bigger