Update README.rdoc
Update README.rdoc
fixed some styling issues
Merge branch 'master' of github.com:loed-idzinga/lifefire into karma

Conflicts:
	app/controllers/stream_controller.rb
	db/schema.rb
Update karma concern and spec