Merge pull request #29 from caseyg1204/master

Added twitter handler; updated sample data; modified package.json file
Revert "Added twitter handler; updated sample data; modified package.json file"
Merge pull request #30 from socialSearch/revert-29-master

Revert "Added twitter handler; updated sample data; modified package.jso...
Merge branch 'master' of https://github.com/socialSearch/socialSearch

Conflicts:
	server/api/search/Stubs.js
	server/api/search/twitter.js
	server/api/search/twitter.spec.js