add env setup and twitter stream
Merge branch 'master' of heroku.com:twitggj

Conflicts:
	server.js