old
update from laptop
Merge branch 'master' of https://github.com/jamie-conlon/twitter_stream

Conflicts:
	rss_engine.rb
	startup.rb
	twitter_stream.rb
Merge branch 'master' of https://github.com/jamie-conlon/twitter_stream

Merging from Nitrous.io because it's much newer.
some tidying up