added translated sentiment lookups and a button to halt the stream
Merge branch 'master' of https://github.com/spike01/final-project-prototyping

Conflicts:
	.DS_Store
	.gitignore
	README.md
	canvas/coords.txt
	canvas/index.html
	canvas/jquery-2.1.1.min.js
	canvas/kinetic-v5.1.0.min.js
	canvas/kinetic.js
	canvas/styles.css
	canvas/uktweets.txt
	nodeserver/ejs/.gitmodules
	nodeserver/ejs/.npmignore
	nodeserver/ejs/.travis.yml
	nodeserver/ejs/History.md
	nodeserver/ejs/Makefile
	nodeserver/ejs/Readme.md
	nodeserver/ejs/benchmark.js
	nodeserver/ejs/ejs.js
	nodeserver/ejs/ejs.min.js
	nodeserver/ejs/examples/client.html
	nodeserver/ejs/examples/functions.ejs
	nodeserver/ejs/examples/functions.js
	nodeserver/ejs/examples/list.ejs
	nodeserver/ejs/examples/list.js
	nodeserver/ejs/index.js
	nodeserver/ejs/lib/ejs.js
	nodeserver/ejs/lib/filters.js
	nodeserver/ejs/lib/utils.js
	nodeserver/ejs/package.json
	nodeserver/ejs/support/compile.js
	nodeserver/ejs/test/ejs.js
	nodeserver/ejs/test/fixtures/backslash.ejs
	nodeserver/ejs/test/fixtures/backslash.html
	nodeserver/ejs/test/fixtures/comments.ejs
	nodeserver/ejs/test/fixtures/comments.html
	nodeserver/ejs/test/fixtures/double-quote.ejs
	nodeserver/ejs/test/fixtures/double-quote.html
	nodeserver/ejs/test/fixtures/error.ejs
	nodeserver/ejs/test/fixtures/error.out
	nodeserver/ejs/test/fixtures/fail.ejs
	nodeserver/ejs/test/fixtures/include.css.ejs
	nodeserver/ejs/test/fixtures/include.css.html
	nodeserver/ejs/test/fixtures/include.ejs
	nodeserver/ejs/test/fixtures/include.html
	nodeserver/ejs/test/fixtures/includes/menu-item.ejs
	nodeserver/ejs/test/fixtures/includes/menu/item.ejs
	nodeserver/ejs/test/fixtures/menu.ejs
	nodeserver/ejs/test/fixtures/menu.html
	nodeserver/ejs/test/fixtures/messed.ejs
	nodeserver/ejs/test/fixtures/messed.html
	nodeserver/ejs/test/fixtures/newlines.ejs
	nodeserver/ejs/test/fixtures/newlines.html
	nodeserver/ejs/test/fixtures/no.newlines.ejs
	nodeserver/ejs/test/fixtures/no.newlines.html
	nodeserver/ejs/test/fixtures/para.ejs
	nodeserver/ejs/test/fixtures/pet.ejs
	nodeserver/ejs/test/fixtures/single-quote.ejs
	nodeserver/ejs/test/fixtures/single-quote.html
	nodeserver/ejs/test/fixtures/style.css
	nodeserver/ejs/test/fixtures/user.ejs
	nodeserver/express/.npmignore
	nodeserver/express/History.md
	nodeserver/express/LICENSE
	nodeserver/express/Readme.md
	nodeserver/express/index.js
	nodeserver/express/lib/application.js
	nodeserver/express/lib/express.js
	nodeserver/express/lib/middleware/init.js
	nodeserver/express/lib/middleware/query.js
	nodeserver/express/lib/request.js
	nodeserver/express/lib/response.js
	nodeserver/express/lib/router/index.js
	nodeserver/express/lib/router/layer.js
	nodeserver/express/lib/router/match.js
	nodeserver/express/lib/router/route.js
	nodeserver/express/lib/utils.js
	nodeserver/express/lib/view.js
	nodeserver/express/package.json
	nodeserver/package.json
	nodeserver/public/css/styles.css
	nodeserver/public/js/jquery-2.1.1.min.js
	nodeserver/public/js/kinetic-v5.1.0.min.js
	nodeserver/public/js/kinetic.js
	nodeserver/public/js/sentimentlookup.js
	nodeserver/server.js
	nodeserver/views/index.ejs
	tweetstream/.DS_Store
	tweetstream/coords.txt
	tweetstream/file.txt
	tweetstream/sample.json
	tweetstream/tweet.json
	tweetstream/tweet2.json
	tweetstream/tweetstream.rb
	tweetstream/twittergem.rb
	tweetstream/uk_tweets.txt
	twitter-api-stuff/.DS_Store
	twitter-api-stuff/node-twitter-api/.DS_Store
	twitter-api-stuff/node-twitter-api/index.html
	twitter-api-stuff/node-twitter-api/package.json
	twitter-api-stuff/node-twitter-api/server.js
	twitter-api-stuff/node-twitter-api/twitter-api-prototype.js
	twitter-api-stuff/node-twitter-api/uktweets.txt
	twitter-api-stuff/sentiment_analysis.rb
	twitter-api-stuff/twitterApi.js
	twitter-socks/package.json
	twitter-socks/server.js