Add twitter client to environment
Merge branch 'master' of https://github.com/cicadas-2014/EmotionAll
Implement twitter client in rails code. Can make api calls in controllers.
Merge pull request #7 from danielleadams/map_json_tests

Map json tests
Add Tweet and Trend model. Working on methods to make api calls.
pull from upstream master
Merge branch 'master' of https://github.com/cicadas-2014/EmotionAll
Merge branch 'master' of https://github.com/kz363/EmotionAll into rspec_tests
merge with kevins twitter api fork
remove old jasmine tests and add map feature spec tests
Merge branch 'rspec_tests'