Merge pull request #67 from newrube7/ruben/controller_specs

Modify .travis file
Travis file updated for twitter api
Merge branch 'master' of https://github.com/cicadas-2014/EmotionAll into ruben/controller_specs